From 4a08d192a7672cda2ebe690dac82018e77fc36f2 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Tue, 6 Oct 1998 23:21:47 +0000 Subject: [PATCH] (ediff-arrange-auto-save-in-merge-jobs): Renamed from ediff-arrange-autosave-in-merge-jobs. Callers changed. --- lisp/ediff-util.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 320e6ac5ec..e87cd821e3 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -500,7 +500,7 @@ to invocation.") (ediff-visible-region) (run-hooks 'startup-hooks) - (ediff-arrange-autosave-in-merge-jobs merge-buffer-file) + (ediff-arrange-auto-save-in-merge-jobs merge-buffer-file) (ediff-refresh-mode-lines) (setq buffer-read-only t) @@ -552,7 +552,7 @@ to invocation.") ;; This executes in control buffer and sets auto-save, visited file name, etc, ;; in the merge buffer -(defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file) +(defun ediff-arrange-auto-save-in-merge-jobs (merge-buffer-file) (if (not ediff-merge-job) () (if (stringp merge-buffer-file) -- 2.20.1