aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-util.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 320e6ac5ec8..e87cd821e32 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -500,7 +500,7 @@ to invocation.")
500 (ediff-visible-region) 500 (ediff-visible-region)
501 501
502 (run-hooks 'startup-hooks) 502 (run-hooks 'startup-hooks)
503 (ediff-arrange-autosave-in-merge-jobs merge-buffer-file) 503 (ediff-arrange-auto-save-in-merge-jobs merge-buffer-file)
504 504
505 (ediff-refresh-mode-lines) 505 (ediff-refresh-mode-lines)
506 (setq buffer-read-only t) 506 (setq buffer-read-only t)
@@ -552,7 +552,7 @@ to invocation.")
552 552
553;; This executes in control buffer and sets auto-save, visited file name, etc, 553;; This executes in control buffer and sets auto-save, visited file name, etc,
554;; in the merge buffer 554;; in the merge buffer
555(defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file) 555(defun ediff-arrange-auto-save-in-merge-jobs (merge-buffer-file)
556 (if (not ediff-merge-job) 556 (if (not ediff-merge-job)
557 () 557 ()
558 (if (stringp merge-buffer-file) 558 (if (stringp merge-buffer-file)