diff options
Diffstat (limited to 'evil-search.el')
| -rw-r--r-- | evil-search.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/evil-search.el b/evil-search.el index d87acad..4df38b7 100644 --- a/evil-search.el +++ b/evil-search.el @@ -895,7 +895,8 @@ message to be shown. This function does nothing if (defun evil-ex-search-start-session () "Initialize Ex for interactive search." (remove-hook 'minibuffer-setup-hook #'evil-ex-search-start-session) - (add-hook 'after-change-functions #'evil-ex-search-update-pattern nil t) + (when evil-ex-search-incremental + (add-hook 'after-change-functions #'evil-ex-search-update-pattern nil t)) (add-hook 'minibuffer-exit-hook #'evil-ex-search-stop-session) (add-hook 'mouse-leave-buffer-hook #'evil-ex-search-exit) (evil-ex-search-activate-highlight nil)) @@ -1140,7 +1141,9 @@ current search result." evil-ex-search-match-end (match-end 0)) (evil-ex-search-goto-offset offset) (evil-push-search-history search-string (eq direction 'forward)) - (unless evil-ex-search-persistent-highlight + (when (and (not evil-ex-search-incremental) evil-ex-search-highlight-all) + (evil-ex-search-activate-highlight pattern)) + (when (and evil-ex-search-incremental (not evil-ex-search-persistent-highlight)) (evil-ex-delete-hl 'evil-ex-search))) (t (goto-char evil-ex-search-start-point) |