summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-util.el')
-rw-r--r--lisp/ediff-util.el7
1 files changed, 2 insertions, 5 deletions
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