diff options
| author | Juri Linkov | 2018-12-25 23:54:26 +0200 |
|---|---|---|
| committer | Juri Linkov | 2018-12-25 23:54:26 +0200 |
| commit | 4fd19c236f5647d586280b85e9606b3e5dbdff4f (patch) | |
| tree | 1d4365505ba9aea9fbabc006a0d5c9c6c22cd5d0 | |
| parent | f360cf9843fb56d1690cf94bdfe435ba740a992e (diff) | |
| download | emacs-4fd19c236f5647d586280b85e9606b3e5dbdff4f.tar.gz emacs-4fd19c236f5647d586280b85e9606b3e5dbdff4f.zip | |
* lisp/isearch.el (isearch-done): Reset isearch-lazy-highlight-last-string
to nil (bug#33838).
(isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-buffer-update): Don't set arg ELLIPSIS of
isearch-message to t to not reset the value of isearch-error.
| -rw-r--r-- | lisp/isearch.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index dd0973d4ea6..d2c1c150b56 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -1357,6 +1357,7 @@ NOPUSH is t and EDIT is t." | |||
| 1357 | (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) | 1357 | (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) |
| 1358 | (isearch-dehighlight) | 1358 | (isearch-dehighlight) |
| 1359 | (lazy-highlight-cleanup lazy-highlight-cleanup) | 1359 | (lazy-highlight-cleanup lazy-highlight-cleanup) |
| 1360 | (setq isearch-lazy-highlight-last-string nil) | ||
| 1360 | (let ((found-start (window-group-start)) | 1361 | (let ((found-start (window-group-start)) |
| 1361 | (found-point (point))) | 1362 | (found-point (point))) |
| 1362 | (when isearch-window-configuration | 1363 | (when isearch-window-configuration |
| @@ -3768,7 +3769,7 @@ by other Emacs features." | |||
| 3768 | (when isearch-lazy-count-current | 3769 | (when isearch-lazy-count-current |
| 3769 | (setq isearch-lazy-count-current | 3770 | (setq isearch-lazy-count-current |
| 3770 | (gethash (point) isearch-lazy-count-hash 0)) | 3771 | (gethash (point) isearch-lazy-count-hash 0)) |
| 3771 | (isearch-message nil t)))) | 3772 | (isearch-message)))) |
| 3772 | 3773 | ||
| 3773 | (defun isearch-lazy-highlight-search (string bound) | 3774 | (defun isearch-lazy-highlight-search (string bound) |
| 3774 | "Search ahead for the next or previous match, for lazy highlighting. | 3775 | "Search ahead for the next or previous match, for lazy highlighting. |
| @@ -3971,7 +3972,7 @@ Attempt to do the search exactly the way the pending Isearch would." | |||
| 3971 | (setq isearch-lazy-count-total 0)) | 3972 | (setq isearch-lazy-count-total 0)) |
| 3972 | (setq isearch-lazy-count-current | 3973 | (setq isearch-lazy-count-current |
| 3973 | (gethash opoint isearch-lazy-count-hash 0)) | 3974 | (gethash opoint isearch-lazy-count-hash 0)) |
| 3974 | (isearch-message nil t)) | 3975 | (isearch-message)) |
| 3975 | (setq isearch-lazy-highlight-timer | 3976 | (setq isearch-lazy-highlight-timer |
| 3976 | (run-at-time lazy-highlight-interval nil | 3977 | (run-at-time lazy-highlight-interval nil |
| 3977 | 'isearch-lazy-highlight-buffer-update))))))))) | 3978 | 'isearch-lazy-highlight-buffer-update))))))))) |