diff options
| author | Richard M. Stallman | 1996-07-30 21:55:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-07-30 21:55:13 +0000 |
| commit | 43d3039dffe682d1f638e94d1adfa5bd243e0386 (patch) | |
| tree | f539c1457f105c1c959bfe0614f99bd0a61ec4c5 | |
| parent | 2237cac94952a62eeae0438c23ea1986fb4a7663 (diff) | |
| download | emacs-43d3039dffe682d1f638e94d1adfa5bd243e0386.tar.gz emacs-43d3039dffe682d1f638e94d1adfa5bd243e0386.zip | |
(emerge-files-with-ancestor, emerge-files):
Use add-hook to add to QUIT-HOOKS.
| -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.") | |||
| 858 | (and current-prefix-arg | 858 | (and current-prefix-arg |
| 859 | (emerge-read-file-name "Output file" emerge-last-dir-output | 859 | (emerge-read-file-name "Output file" emerge-last-dir-output |
| 860 | f f nil))))) | 860 | f f nil))))) |
| 861 | (if file-out | ||
| 862 | (add-hook 'quit-hooks (` (lambda () (emerge-files-exit (, file-out)))))) | ||
| 861 | (emerge-files-internal | 863 | (emerge-files-internal |
| 862 | file-A file-B startup-hooks | 864 | file-A file-B startup-hooks |
| 863 | (if file-out | 865 | quit-hooks |
| 864 | (cons (` (lambda () (emerge-files-exit (, file-out)))) | ||
| 865 | quit-hooks) | ||
| 866 | quit-hooks) | ||
| 867 | file-out)) | 866 | file-out)) |
| 868 | 867 | ||
| 869 | ;;;###autoload | 868 | ;;;###autoload |
| @@ -881,12 +880,11 @@ This is *not* a user option, since Emerge uses it for its own processing.") | |||
| 881 | (and current-prefix-arg | 880 | (and current-prefix-arg |
| 882 | (emerge-read-file-name "Output file" emerge-last-dir-output | 881 | (emerge-read-file-name "Output file" emerge-last-dir-output |
| 883 | f f nil))))) | 882 | f f nil))))) |
| 883 | (if file-out | ||
| 884 | (add-hook 'quit-hooks (` (lambda () (emerge-files-exit (, file-out)))))) | ||
| 884 | (emerge-files-with-ancestor-internal | 885 | (emerge-files-with-ancestor-internal |
| 885 | file-A file-B file-ancestor startup-hooks | 886 | file-A file-B file-ancestor startup-hooks |
| 886 | (if file-out | 887 | quit-hooks |
| 887 | (cons (` (lambda () (emerge-files-exit (, file-out)))) | ||
| 888 | quit-hooks) | ||
| 889 | quit-hooks) | ||
| 890 | file-out)) | 888 | file-out)) |
| 891 | 889 | ||
| 892 | ;; Write the merge buffer out in place of the file the A buffer is visiting. | 890 | ;; Write the merge buffer out in place of the file the A buffer is visiting. |