summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1998-10-06 23:21:47 +0000
committerKarl Heuer <kwzh@gnu.org>1998-10-06 23:21:47 +0000
commita8bf229c247333e8d79a9574322495a240df881d (patch)
tree7fde97f496ca6edc1e0aa8cb19eba7bda91efc06 /lisp/ediff-util.el
parent5448904cb7ed8df5365a8a2dbf0407dc72125e8b (diff)
downloademacs-a8bf229c247333e8d79a9574322495a240df881d.tar.gz
(ediff-arrange-auto-save-in-merge-jobs): Renamed
from ediff-arrange-autosave-in-merge-jobs. Callers changed.
Diffstat (limited to 'lisp/ediff-util.el')
-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.")
(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)