Skip to content

evil-search: show match count when using isearch #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

evil-search: show match count when using isearch #1992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions evil-search.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ to display in the echo area."
(cancel-timer evil-flash-timer))
(unless (or (null string)
(string= string ""))
(evil-echo-area-save)
(evil-echo "%s" string)
(isearch-highlight (match-beginning 0) (match-end 0))
(when all
(setq isearch-lazy-highlight-wrapped nil
Expand All @@ -133,6 +131,12 @@ to display in the echo area."
(isearch-lazy-highlight-new-loop)
(unless isearch-lazy-highlight-overlays
(isearch-lazy-highlight-update)))
;; `isearch-lazy-count-current` is updated during
;; `isearch-lazy-highlight-update`.
(let ((prefix (isearch-lazy-count-format nil))
(suffix (isearch-lazy-count-format t)))
(evil-echo-area-save)
(evil-echo "%s%s%s" prefix string suffix))
(add-hook 'pre-command-hook #'evil-flash-hook nil t)
(add-hook 'evil-operator-state-exit-hook #'evil-flash-hook nil t)
(add-hook 'pre-command-hook #'evil-clean-isearch-overlays nil t)
Expand Down Expand Up @@ -259,8 +263,6 @@ one more than the current position."
(goto-char orig)
(user-error "\"%s\": %s not found"
string (if regexp-p "pattern" "string"))))
;; always position point at the beginning of the match
(goto-char (match-beginning 0))
;; determine message for echo area
(cond
((and forward (< (point) start))
Expand All @@ -271,7 +273,9 @@ one more than the current position."
(setq string "Search wrapped around TOP of buffer"))
(t
(setq string (evil-search-message string forward))))
(evil-flash-search-pattern string t))))
(evil-flash-search-pattern string t)
;; always position point at the beginning of the match
(goto-char (match-beginning 0)))))

(defun evil-search-word (forward unbounded symbol)
"Search for word near point.
Expand Down