mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

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

Browse Source 
files on the same host.
This commit is contained in:
Michael Albinus 2012-07-03 09:42:31 +02:00
parent b9d8233998
commit b4886f6ece
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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

11
lisp/vc/ediff-diff.el
View File

@ -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)))
))