[elpa] master a1960b7: [el-search] Minor tweaks in el-search-query-replace

[Michael Heerdegen]

branch: master
commit a1960b717eba18c8fc214d47904e7b13ee576d1f
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    [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.
---
 packages/el-search/el-search.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index c2347a3..bc7bc36 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/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")