Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make 'isearch-mode' more idempotent (bug#79368).

Browse source 
* lisp/isearch.el (isearch-mode): Don't override
'isearch--saved-local-map' when 'overriding-terminal-local-map'
was already set to 'isearch-mode-map' in a previous call.
(with-isearch-suspended): Don't call the function 'isearch-mode'
when the variable 'isearch-mode' is already non-nil.
This commit is contained in:
Juri Linkov 2025-09-03 09:45:34 +03:00
parent f97abe6200
commit 2b9c7f9508
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/isearch.el
View file

@ -1322,7 +1322,10 @@ used to set the value of `isearch-regexp-function'."
(setq isearch-mode " Isearch") ;; forward? regexp?
(force-mode-line-update)
(setq isearch--saved-local-map overriding-terminal-local-map)
;; Prevent successive calls overriding original map
;; in `isearch-done'. (Bug#79368)
(unless (eq overriding-terminal-local-map isearch-mode-map)
(setq isearch--saved-local-map overriding-terminal-local-map))
(setq overriding-terminal-local-map isearch-mode-map)
(run-hooks 'isearch-mode-hook)
;; Remember the initial map possibly modified
@ -1765,12 +1768,18 @@ You can update the global isearch variables by setting new values to
(setq isearch-suspended nil)
;; Always resume isearching by restarting it.
(isearch-mode isearch-forward
isearch-regexp
isearch-op-fun
nil
isearch-regexp-function)
;; When aborting recursive minibuffers with a command attempted
;; to use minibuffer while in minibuffer, this unwind form
;; might be called consecutively more than once. So check if
;; `isearch-mode' was already enabled in a previous call
;; in the same unwind form (bug#79368).
(unless isearch-mode
;; Always resume isearching by restarting it.
(isearch-mode isearch-forward
isearch-regexp
isearch-op-fun
nil
isearch-regexp-function))
;; Copy new local values to isearch globals
(setq isearch-string isearch-new-string