[Emacs-diffs] /srv/bzr/emacs/trunk r108839: * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote

[Michael Albinus]

------------------------------------------------------------
revno: 108839
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-03 09:42:31 +0200
message:
  * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote
  files on the same host.
modified:
  lisp/ChangeLog
  lisp/vc/ediff-diff.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-03 07:12:22 +0000
+++ b/lisp/ChangeLog    2012-07-03 07:42:31 +0000
@@ -1,3 +1,8 @@
+2012-07-03  Michael Albinus  <address@hidden>
+
+       * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote
+       files on the same host.
+
 2012-07-03  Andreas Schwab  <address@hidden>
 
        * help-fns.el (describe-function-1): Only call

=== modified file 'lisp/vc/ediff-diff.el'
--- a/lisp/vc/ediff-diff.el     2012-04-09 13:05:48 +0000
+++ b/lisp/vc/ediff-diff.el     2012-07-03 07:42:31 +0000
@@ -1407,9 +1407,14 @@
   (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)))
     ))