1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00

(isearch-resume-enabled): New variable.

(isearch-done): Use that variable.
This commit is contained in:
Kim F. Storm 2001-12-02 01:13:55 +00:00
parent 08cf00d8f7
commit 6848c9f166
2 changed files with 17 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2001-12-02 Kim F. Storm <storm@cua.dk>
* isearch.el (isearch-resume-enabled): New variable.
(isearch-done): Use that variable.
2001-12-01 Eli Zaretskii <eliz@is.elta.co.il>
* progmodes/idlwave.el, progmodes/idlw-rinfo.el:

View File

@ -186,6 +186,11 @@ Ordinarily the text becomes invisible again at the end of the search."
:type 'boolean
:group 'isearch)
(defcustom isearch-resume-enabled t
"*If non-nil, `isearch-resume' commands are added to the command history."
:type 'boolean
:group 'isearch)
(defvar isearch-mode-hook nil
"Function(s) to call after starting up an incremental search.")
@ -647,12 +652,13 @@ is treated as a regexp. See \\[isearch-forward] for more info."
(setq disable-point-adjustment t))
(defun isearch-done (&optional nopush edit)
(let ((command `(isearch-resume ,isearch-string ,isearch-regexp
,isearch-word ,isearch-forward
,isearch-message
',isearch-case-fold-search)))
(unless (equal (car command-history) command)
(setq command-history (cons command command-history))))
(if isearch-resume-enabled
(let ((command `(isearch-resume ,isearch-string ,isearch-regexp
,isearch-word ,isearch-forward
,isearch-message
',isearch-case-fold-search)))
(unless (equal (car command-history) command)
(setq command-history (cons command command-history)))))
(remove-hook 'mouse-leave-buffer-hook 'isearch-done)
(remove-hook 'kbd-macro-termination-hook 'isearch-done)