[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search a661225 272/332: [el-search] Minor tweaks in
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search a661225 272/332: [el-search] Minor tweaks in el-search-query-replace |
Date: |
Tue, 1 Dec 2020 15:49:02 -0500 (EST) |
branch: externals/el-search
commit a6612250e28aaa176c38a3c2142b75780295e758
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
[el-search] Minor tweaks in el-search-query-replace
* packages/el-search/el-search.el
(el-search--search-and-replace-pattern): Visually annotate whether the
current match has been replaced.
Use only one description for the 'r' key no matter whether the current
match has been replaced.
Tweak prompt for ! key.
---
el-search.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/el-search.el b/el-search.el
index c2347a3..bc7bc36 100644
--- a/el-search.el
+++ b/el-search.el
@@ -3707,9 +3707,10 @@ exactly you did? Thanks!"))))
(read-multiple-choice
(let ((nbr-done (+ nbr-replaced
nbr-skipped))
(nbr-to-do (el-search-count-matches
pattern)))
- (format "[%d/%d]"
+ (format "[%d/%d] %s"
(if replaced-this nbr-done (1+
nbr-done))
- (+ nbr-done nbr-to-do)))
+ (+ nbr-done nbr-to-do)
+ (if replaced-this "*" "-")))
(delq nil
(list
`(?y "y"
@@ -3718,10 +3719,8 @@ exactly you did? Thanks!"))))
"Replace match and move to
the next"))
(and (not replaced-this)
'(?n "n" "Move to the next
match"))
- `(?r "r"
- ,(if (not replaced-this)
- "Replace match but don't
move"
- "Restore match"))
+ '(?r "r" "\
+Replace match but don't move or restore match if already replaced")
'(?! "all" "Replace all remaining
matches in this buffer")
'(?b "skip buf"
"Skip this buffer and any
remaining matches in it")
@@ -3765,7 +3764,8 @@ Toggle splicing mode (\\[describe-function]
el-search-query-replace for details)
(el-search-object-properties
el-search--current-search)))
(eq (car
(read-multiple-choice
- "Replace
in all following buffers?"
+ "\
+Also replace in all following buffers?"
'((?!
"Only this"
"\
Replace only remaining matches in this buffer")
- [elpa] externals/el-search eef5de0 243/332: [el-search] Save two 'eval' calls, (continued)
- [elpa] externals/el-search eef5de0 243/332: [el-search] Save two 'eval' calls, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 427afa8 253/332: [el-search] Bump version to 1.7.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0907a21 248/332: [el-search] Bump version to 1.7, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1bc9c89 252/332: [el-search] Improve 'el-search-display-match-count', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ba806ce 251/332: [el-search] Enforce defun start for heuristic matching, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ab5bcd8 266/332: [el-search] Follow-up to "Fix nested match issues in *El Occur*", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2c2930b 256/332: * el-search/el-search.el: Again tweak commentary in header, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5e97386 255/332: [el-search] Improve match faces, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search fdb5656 270/332: [el-search] Make y move forward after replacing, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 75d0232 279/332: [el-search] Fix C-J with numeric arg in case of no match, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a661225 272/332: [el-search] Minor tweaks in el-search-query-replace,
Stefan Monnier <=
- [elpa] externals/el-search e29370e 281/332: [el-search] Fix more "redundant _ pattern" warnings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5c903d9 292/332: [el-search] Small fix for my last commit, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search be0324a 301/332: [el-search] Some minor tweaks and bump version to 1.10.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3b4b95b 304/332: [el-search] Small fix in el-search--changed-files-in-repo, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2f427dd 318/332: [el-search] Query-replace: Change skip keys, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a5dd88c 322/332: [el-search] Minor fix in el-search-query-replace--read-args, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1939340 324/332: [el-search] Harmonize search and qu-replace prefix arg, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 43779b9 329/332: [el-search] Improve "New command el-search-repository", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0c25a34 331/332: Update copyright years of some packages, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cd535ba 194/332: packages/el-search: Some minor tweaks, Stefan Monnier, 2020/12/01