# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1244473462 0
# Node ID bded48e27e29de0ad18c989ee3273479d9ed42f3
# Parent  d76bdfb6c57955554e66795f6264022b3f4bfcf7
* ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
files correctly.

diff -r d76bdfb6c579 -r bded48e27e29 lisp/ediff-util.el
--- a/lisp/ediff-util.el	Mon Jun 08 12:00:18 2009 +0000
+++ b/lisp/ediff-util.el	Mon Jun 08 15:04:22 2009 +0000
@@ -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