* vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote

files on the same host.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a9e648f1cc45b9d8c962022bb4f87fd24ec7da6..ff526afcee16c197ed069558609406cb83af9291 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-03  Michael Albinus  <michael.albinus@gmx.de>
+
+       * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote
+       files on the same host.
+
 2012-07-03  Andreas Schwab  <schwab@linux-m68k.org>
 
        * help-fns.el (describe-function-1): Only call

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 6d67356852cac77bce4edca01428cf122ffcc620..31a5436acd9bf2b63001aef5cf7bfb1281a60f22 100644 (file)
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1407,9 +1407,14 @@ arguments to `skip-chars-forward'."
   (if (and (not (file-directory-p f1))
            (not (file-directory-p f2)))
       (let ((res
-            (apply 'call-process ediff-cmp-program nil nil nil
-                   (append ediff-cmp-options (list (expand-file-name f1)
-                                                   (expand-file-name f2))))
+            ;; In the remote case, this works only if F1 and F2 are
+            ;; located on the same remote host.
+            (apply 'process-file ediff-cmp-program nil nil nil
+                   (append ediff-cmp-options
+                           (list (or (file-remote-p f1 'localname)
+                                     (expand-file-name f1))
+                                 (or (file-remote-p f2 'localname)
+                                     (expand-file-name f2)))))
             ))
        (and (numberp res) (eq res 0)))
     ))