diff options
author | Gerd Moellmann <gerd@gnu.org> | 2001-01-08 12:25:44 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2001-01-08 12:25:44 +0000 |
commit | 8af41b82e1cd1e99c8f0ee97a9538e34b0dcbd3d (patch) | |
tree | e6d8d2a2713269458f8d2023091e77e8c5cb41c5 /lisp/isearch.el | |
parent | 5a0d2d5e2284897cc6bc61462f42dfb4b955b62e (diff) | |
download | emacs-8af41b82e1cd1e99c8f0ee97a9538e34b0dcbd3d.tar.gz |
(isearch-old-signal-hook): Removed.
(isearch-mode): Add isearch-done to kbd-macro-termination-hook
instead of setting signal-hook-function.
(isearch-done): Remove isearch-done from kbd-macro-termination-hook.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r-- | lisp/isearch.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 89cf07d89c8..e4a51ffc298 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -404,9 +404,6 @@ Default value, nil, means edit the string instead." ;; isearch is invoked. (defvar isearch-input-method-local-p nil) -;; Value of `signal-hook-function' before setting our own. -(defvar isearch-old-signal-hook nil) - ;; Minor-mode-alist changes - kind of redundant with the ;; echo area, but if isearching in multiple windows, it can be useful. @@ -579,8 +576,7 @@ is treated as a regexp. See \\[isearch-forward] for more info." (run-hooks 'isearch-mode-hook) (add-hook 'mouse-leave-buffer-hook 'isearch-done) - (setq isearch-old-signal-hook signal-hook-function - signal-hook-function 'isearch-done) + (add-hook 'kbd-macro-termination-hook 'isearch-done) ;; isearch-mode can be made modal (in the sense of not returning to ;; the calling function until searching is completed) by entering @@ -641,7 +637,7 @@ is treated as a regexp. See \\[isearch-forward] for more info." (setq command-history (cons command command-history)))) (remove-hook 'mouse-leave-buffer-hook 'isearch-done) - (setq signal-hook-function isearch-old-signal-hook) + (remove-hook 'kbd-macro-termination-hook 'isearch-done) ;; Called by all commands that terminate isearch-mode. ;; If NOPUSH is non-nil, we don't push the string on the search ring. |