diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-07-30 21:55:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-07-30 21:55:13 +0000 |
| commit | a3f6202cfd2624f5cf38d381a4f893f8fd556c09 (patch) | |
| tree | a5205d2a0ade049e7e68ea753064728148b6ccdc /lisp/emerge.el | |
| parent | 0412037c567c68fd4e7f6a9e0452e3ab38b3f1f3 (diff) | |
| download | emacs-a3f6202cfd2624f5cf38d381a4f893f8fd556c09.tar.gz | |
(emerge-files-with-ancestor, emerge-files):
Use add-hook to add to QUIT-HOOKS.
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index f842ce6f3ac..b8b085f64e5 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -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. |