1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00

(emerge-files-with-ancestor, emerge-files):

Use add-hook to add to QUIT-HOOKS.
This commit is contained in:
Richard M. Stallman 1996-07-30 21:55:13 +00:00
parent 2237cac949
commit 43d3039dff

View File

@ -858,12 +858,11 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(and current-prefix-arg
(emerge-read-file-name "Output file" emerge-last-dir-output
f f nil)))))
(if file-out
(add-hook 'quit-hooks (` (lambda () (emerge-files-exit (, file-out))))))
(emerge-files-internal
file-A file-B startup-hooks
(if file-out
(cons (` (lambda () (emerge-files-exit (, file-out))))
quit-hooks)
quit-hooks)
quit-hooks
file-out))
;;;###autoload
@ -881,12 +880,11 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(and current-prefix-arg
(emerge-read-file-name "Output file" emerge-last-dir-output
f f nil)))))
(if file-out
(add-hook 'quit-hooks (` (lambda () (emerge-files-exit (, file-out))))))
(emerge-files-with-ancestor-internal
file-A file-B file-ancestor startup-hooks
(if file-out
(cons (` (lambda () (emerge-files-exit (, file-out))))
quit-hooks)
quit-hooks)
quit-hooks
file-out))
;; Write the merge buffer out in place of the file the A buffer is visiting.