Mercurial > emacs
changeset 103350:bded48e27e29
* ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
files correctly.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 08 Jun 2009 15:04:22 +0000 |
| parents | d76bdfb6c579 |
| children | 0bed5747a151 |
| files | lisp/ediff-util.el |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-util.el Mon Jun 08 12:00:18 2009 +0000 +++ b/lisp/ediff-util.el Mon Jun 08 15:04:22 2009 +0000 @@ -3416,11 +3416,8 @@ (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