Mercurial > emacs
changeset 35120:ec6003a7be16
(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.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 08 Jan 2001 12:25:44 +0000 |
| parents | 97a19f647a12 |
| children | 903e5617df18 |
| files | lisp/isearch.el |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/isearch.el Mon Jan 08 12:23:32 2001 +0000 +++ b/lisp/isearch.el Mon Jan 08 12:25:44 2001 +0000 @@ -404,9 +404,6 @@ ;; 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 @@ (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 @@ (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.