[Emacs-diffs] emacs/lisp ediff-util.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/06/08 15:04:22

Modified files:
        lisp           : ediff-util.el 

Log message:
        * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
        files correctly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-util.el?cvsroot=emacs&r1=1.97&r2=1.98

Patches:
Index: ediff-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- ediff-util.el       9 Jan 2009 04:44:19 -0000       1.97
+++ ediff-util.el       8 Jun 2009 15:04:22 -0000       1.98
@@ -3416,11 +3416,8 @@
     (ediff-exec-process
      ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
      ediff-custom-diff-options
-     ;; repetition of buf-A-file-name is needed so it'll return a file
-     (or (and buf-A-file-name (file-exists-p buf-A-file-name) buf-A-file-name)
-        file-A)
-     (or (and buf-B-file-name (file-exists-p buf-B-file-name) buf-B-file-name)
-        file-B))
+     (or file-A buf-A-file-name)
+     (or file-B buf-B-file-name))
     ;; put the diff file in diff-mode, if it is available
     (if (fboundp 'diff-mode)
        (with-current-buffer ediff-custom-diff-buffer