mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-12 16:23:57 +00:00
Code Issues Releases Activity

(isearch-old-signal-hook): Removed.

Browse Source 
(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.
This commit is contained in:
Gerd Moellmann 2001-01-08 12:26:23 +00:00
parent 2136b40855
commit 7e56ea04ca
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2001-01-08 Gerd Moellmann <gerd@gnu.org>
* 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 <eliz@is.elta.co.il>
* mail/sendmail.el (mail-mode): Doc fix.

8
lisp/isearch.el
View File

@ -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.