From: Michael Albinus Date: Tue, 3 Jul 2012 07:42:31 +0000 (+0200) Subject: * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote X-Git-Tag: emacs-24.2.90~1199^2~248 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4886f6ece24edc42f796aef763ce08ab3aca75d;p=emacs.git * 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 6a9e648f1cc..ff526afcee1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-07-03 Michael Albinus + + * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote + files on the same host. + 2012-07-03 Andreas Schwab * help-fns.el (describe-function-1): Only call diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 6d67356852c..31a5436acd9 100644 --- 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))) ))