Mercurial > hg > xemacs-beta

diff lisp/ediff/ediff-init.el @ 26:441bb1e64a06 r19-15b96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents 4103f0995bd7
children 131b0175ea99
line wrap: on
line diff
--- a/lisp/ediff/ediff-init.el	Mon Aug 13 08:51:05 2007 +0200
+++ b/lisp/ediff/ediff-init.el	Mon Aug 13 08:51:32 2007 +0200
@@ -1156,10 +1156,10 @@
 
 ;;; In-line functions
 
-(or (fboundp 'ediff-file-remote-p) ; user supplied his own function
+(or (fboundp 'ediff-file-remote-p) ; user supplied his own function: use it
     (defun ediff-file-remote-p (file-name)
-      (car (cond ((featurep 'efs) (efs-ftp-path file-name))
-		 ((fboundp 'file-remote-p) (efs-ftp-path file-name))
+      (car (cond ((featurep 'efs-auto) (efs-ftp-path file-name))
+		 ((fboundp 'file-remote-p) (file-remote-p file-name))
 		 (t (require 'ange-ftp)
 		    ;; Can happen only in Emacs, since XEmacs has file-remote-p
 		    (ange-ftp-ftp-name file-name))))))