Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/lisp/ediff/ediff-init.el	Mon Aug 13 09:15:13 2007 +0200
+++ b/lisp/ediff/ediff-init.el	Mon Aug 13 09:15:49 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))))))