From 7e56ea04ca076403aeb2d81281a57d1bae45c7da Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Mon, 8 Jan 2001 12:26:23 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 7 +++++++ lisp/isearch.el | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f2a62901d7..2f51cc65464 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2001-01-08 Gerd Moellmann + + * isearch.el (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. + 2001-01-07 Eli Zaretskii * mail/sendmail.el (mail-mode): Doc fix. 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. -- 2.39.2