mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-01 20:06:00 +00:00
(ediff-arrange-auto-save-in-merge-jobs): Renamed
from ediff-arrange-autosave-in-merge-jobs. Callers changed.
This commit is contained in:
parent
f6b0805aa1
commit
4a08d192a7
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user