diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2009-06-08 15:04:47 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2009-06-08 15:04:47 +0000 |
| commit | 4fd536b6033dee698c6b8bb702822cfd10b115b2 (patch) | |
| tree | f351693dc51ef34618ba687936f0f682dce76687 | |
| parent | a22fb0fa44adf86597300698b1543bb5f523be1f (diff) | |
| download | emacs-4fd536b6033dee698c6b8bb702822cfd10b115b2.tar.gz | |
* ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
files correctly.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ediff-util.el | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 37a58bcd20c..c469751d6af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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) diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 4885ca472e2..d0be103b8a6 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -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 |