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

files on the same host.

1 files changed, 8 insertions, 3 deletions

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 6d67356852..31a5436acd 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)))
     ))