Mercurial > emacs
changeset 15804:dd08f1c1f488
(emerge-files-with-ancestor, emerge-files):
Use add-hook to add to QUIT-HOOKS.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 30 Jul 1996 21:55:13 +0000 |
| parents | f214673e68a8 |
| children | 6081df437242 |
| files | lisp/emerge.el |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emerge.el Tue Jul 30 21:10:40 1996 +0000 +++ b/lisp/emerge.el Tue Jul 30 21:55:13 1996 +0000 @@ -858,12 +858,11 @@ (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 @@ (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.