Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-init.el @ 102:a145efe76779 r20-1b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b3
author cvs
date Mon, 13 Aug 2007 09:15:49 +0200
parents 4be1180a9e89
children 318232e2a3f0
comparison
equal deleted inserted replaced
101:a0ec055d74dd 102:a145efe76779
1154 (ediff-defvar-local ediff-temp-file-C nil 1154 (ediff-defvar-local ediff-temp-file-C nil
1155 "Temporary file used for refining difference regions in buffer C.") 1155 "Temporary file used for refining difference regions in buffer C.")
1156 1156
1157 ;;; In-line functions 1157 ;;; In-line functions
1158 1158
1159 (or (fboundp 'ediff-file-remote-p) ; user supplied his own function 1159 (or (fboundp 'ediff-file-remote-p) ; user supplied his own function: use it
1160 (defun ediff-file-remote-p (file-name) 1160 (defun ediff-file-remote-p (file-name)
1161 (car (cond ((featurep 'efs) (efs-ftp-path file-name)) 1161 (car (cond ((featurep 'efs-auto) (efs-ftp-path file-name))
1162 ((fboundp 'file-remote-p) (efs-ftp-path file-name)) 1162 ((fboundp 'file-remote-p) (file-remote-p file-name))
1163 (t (require 'ange-ftp) 1163 (t (require 'ange-ftp)
1164 ;; Can happen only in Emacs, since XEmacs has file-remote-p 1164 ;; Can happen only in Emacs, since XEmacs has file-remote-p
1165 (ange-ftp-ftp-name file-name)))))) 1165 (ange-ftp-ftp-name file-name))))))
1166 1166
1167 1167