Commit 4fd536b6 authored by Michael Albinus's avatar Michael Albinus
Browse files

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

files correctly.
parent a22fb0fa
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)
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment