aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ediff.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 14e1461a8a7..5327b0961d3 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1401,8 +1401,8 @@ Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1401 'no-dirs))) 1401 'no-dirs)))
1402 (find-file file) 1402 (find-file file)
1403 (if (and (buffer-modified-p) 1403 (if (and (buffer-modified-p)
1404 (y-or-n-p (message "Buffer %s is modified. Save buffer? " 1404 (y-or-n-p (format "Buffer %s is modified. Save buffer? "
1405 (buffer-name)))) 1405 (buffer-name))))
1406 (save-buffer (current-buffer))) 1406 (save-buffer (current-buffer)))
1407 (let (rev1 rev2) 1407 (let (rev1 rev2)
1408 (setq rev1 1408 (setq rev1