[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 79095f6 143/332: Improve summary message of `
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 79095f6 143/332: Improve summary message of `el-search-overview' |
Date: |
Tue, 1 Dec 2020 15:48:30 -0500 (EST) |
branch: externals/el-search
commit 79095f6187541fb0506dbb64433af60a77bf05d4
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
Improve summary message of `el-search-overview'
---
el-search.el | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/el-search.el b/el-search.el
index b8c0abe..70b1acf 100644
--- a/el-search.el
+++ b/el-search.el
@@ -1681,7 +1681,8 @@ With prefix arg, restart the current search."
(defun el-search--occur (search)
;; This is a poorly written stub!
(cl-letf ((occur-buffer (generate-new-buffer "*El Occur*"))
- (last nil) (matches nil) (overall-matches 0)
+ (last nil) (matches nil)
+ (matching-files 0) (matching-buffers 0) (overall-matches 0)
(el-search-keep-hl t)
((symbol-function 'el-search-hl-remove) #'ignore))
(setq this-command 'el-search-pattern)
@@ -1700,10 +1701,18 @@ With prefix arg, restart the current search."
(when matches (insert (format "%3d matches in %S\n" matches
(or (cadr last) (car last)))))
(redisplay)
(setq last (list buffer file))
- (setq matches 1)))
+ (setq matches 1)
+ (if file (cl-incf matching-files) (when buffer (cl-incf
matching-buffers)))))
(stream-append (el-search-object-matches
(el-search-reset-search search))
(stream (list (list nil nil nil)))))
- (insert (format "\n\n%d matches in total." overall-matches))
+ (insert
+ (if (zerop overall-matches)
+ "No matches"
+ (concat
+ (format "\n\n%d matches in " overall-matches)
+ (unless (zerop matching-files) (format "%d files"
matching-files))
+ (unless (or (zerop matching-files) (zerop matching-buffers))
" and ")
+ (unless (zerop matching-buffers) (format "%d buffers"
matching-buffers)))))
(setq done t))
(unless done (insert "\n\nAborted."))
(el-search--message-no-log ""))))))
- [elpa] externals/el-search e38bea8 106/332: Add calling convention to el-search-defpattern's docstring, (continued)
- [elpa] externals/el-search e38bea8 106/332: Add calling convention to el-search-defpattern's docstring, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e54336d 104/332: Fix el-search-query-replace reindent wrongly in narrowed buffer, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e2f56c7 109/332: Simplify nested backquotes, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e7dda1b 118/332: Call el-search--wrap-pattern at better places, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 922281a 112/332: Fix replacement verification for splicing mode, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6de72a5 121/332: `change', `changed': make "HEAD" as default explicit, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 7fe5fb7 126/332: Some details, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2a0773f 134/332: Use jka-compr-load-suffixes instead of hardcoded suffixes, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 644b04d 139/332: el-search: bump version to 1.2.2, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b500266 151/332: Tweak el-search--pp-to-string, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 79095f6 143/332: Improve summary message of `el-search-overview',
Stefan Monnier <=
- [elpa] externals/el-search 3772a97 133/332: Add a helpful comment; bump version to 1.2.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0808109 161/332: Fix el-search--change-p for atoms, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f028826 163/332: Narrow down the semantics of symbol LPATs, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c70b003 164/332: Use stream-x.el, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a4004b3 167/332: Make `el-search-reset-search' modify its argument, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2871f22 178/332: Recover from search head pointing to a killed buffer, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cf5b5a9 177/332: Display an x/y-style match count in the echo area, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ca6b9f2 183/332: Add a PROMPT arg to `el-search--read-pattern-for-interactive', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d2b8f84 184/332: New command `el-search-count-matches', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 468745a 185/332: Show match count for `el-search-query-replace', Stefan Monnier, 2020/12/01