procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix improvement of isearch in auto-narrow-mode.

Browse source 
* lisp/files.el (auto-narrow--reset-isearch-lazy-highlight): New internal
function.
(auto-narrow-pre-command-function, auto-narrow-post-command-function): Use the
new internal function.
This commit is contained in:
Gregory Heytings 2022-07-06 16:01:57 +00:00
parent 051d2a1e36
commit 7b19ce51fc
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/files.el
View file

@ -2729,6 +2729,11 @@ beginning and end of the buffer."
(defvar-local auto-narrow--isearch-lazy-highlight nil
"Internal variable used by `auto-narrow-mode'.")
(defun auto-narrow--reset-isearch-lazy-highlight ()
"Internal function used by `auto-narrow-mode'."
(when auto-narrow-mode
(setq-local isearch-lazy-highlight auto-narrow--isearch-lazy-highlight)))
(defvar-local auto-narrow--initialized nil
"Internal variable used by `auto-narrow-mode'.")
@ -2736,8 +2741,7 @@ beginning and end of the buffer."
"Conditionally widen display when `auto-narrow-mode' is in effect."
(when auto-narrow-mode
(setq-local widen-automatically t
isearch-widen-automatically t
isearch-lazy-highlight auto-narrow--isearch-lazy-highlight)
isearch-widen-automatically t)
(if (memq this-command '(narrow-to-region narrow-to-defun narrow-to-page))
(setq auto-narrow--narrowing-state 'explicit
widen-automatically auto-narrow--widen-automatically
@ -2754,6 +2758,7 @@ beginning and end of the buffer."
(not (eq auto-narrow--narrowing-state 'explicit)))
(unless auto-narrow--initialized
(run-hooks 'auto-narrow-hook)
(add-hook 'isearch-mode-end-hook #'auto-narrow--reset-isearch-lazy-highlight)
(setq auto-narrow--widen-automatically widen-automatically
auto-narrow--isearch-widen-automatically isearch-widen-automatically
auto-narrow--isearch-lazy-highlight isearch-lazy-highlight