mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

* ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote

Browse Source 
files correctly.
This commit is contained in:
Michael Albinus 2009-06-08 15:04:47 +00:00
parent a22fb0fa44
commit 4fd536b603
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2009-06-08 Michael Albinus <michael.albinus@gmx.de>
* ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
files correctly.
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
* term/ns-win.el (composition-function-table)

7
lisp/ediff-util.el
View File

@ -3416,11 +3416,8 @@ Without an argument, it saves customized diff argument, if available
(ediff-exec-process
ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
ediff-custom-diff-options
;; repetition of buf-A-file-name is needed so it'll return a file
(or (and buf-A-file-name (file-exists-p buf-A-file-name) buf-A-file-name)
file-A)
(or (and buf-B-file-name (file-exists-p buf-B-file-name) buf-B-file-name)
file-B))
(or file-A buf-A-file-name)
(or file-B buf-B-file-name))
;; put the diff file in diff-mode, if it is available
(if (fboundp 'diff-mode)
(with-current-buffer ediff-custom-diff-buffer