[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search c95de2b 317/332: [el-search] Shorten el-searc
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search c95de2b 317/332: [el-search] Shorten el-search-query-replace prompt again |
Date: |
Tue, 1 Dec 2020 15:49:12 -0500 (EST) |
branch: externals/el-search
commit c95de2b9e762903d6f3ce0e652b5830342627a3f
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
[el-search] Shorten el-search-query-replace prompt again
Also update header and bump version to 1.12.2.
* packages/el-search/el-search.el
(el-search--search-and-replace-pattern): Force using no dialog box
which won't work with the large variety of choices. Emacs would try
to use a dialog box when resuming a session with the menu entry
"Resume Query-Replace".
Use shorter names for 'read-multiple-choice' so that the prompt fits
in one line.
Change o (show) and e (ediff) to e (edit) and E (Ediff).
---
NEWS | 6 ++++++
el-search.el | 23 ++++++++++++-----------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/NEWS b/NEWS
index 8bb6b21..ebf52af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
Some of the user visible news were:
+Version: 1.12.2
+
+ Some changes to the 'el-search-query-replace' prompt to make it
+ shorter. The keys o and e to show and ediff the replacement changed
+ to e and E ("edit", "Ediff").
+
Version: 1.12.1
Like searches, 'el-search-query-replace' sessions are now also
diff --git a/el-search.el b/el-search.el
index 5ce4530..2c28e4e 100644
--- a/el-search.el
+++ b/el-search.el
@@ -7,7 +7,7 @@
;; Created: 29 Jul 2015
;; Keywords: lisp
;; Compatibility: GNU Emacs 25
-;; Version: 1.12.1
+;; Version: 1.12.2
;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0"))
@@ -333,7 +333,7 @@
;; There are two ways to edit replacements directly while performing
;; an el-search-query-replace:
;;
-;; (1) Without suspending the search: hit o at the prompt to show the
+;; (1) Without suspending the search: hit e at the prompt to show the
;; replacement of the current match in a separate buffer. You can
;; edit the replacement in this buffer. Confirming with C-c C-c will
;; make el-search replace the current match with this buffer's
@@ -4609,6 +4609,7 @@ exactly you did? Thanks!"))))
(kill-buffer buffer))
(el-search--after-scroll (selected-window)
(window-start))
nil)))
+ (use-dialog-box nil)
(query
(lambda ()
(if stopped-for-comments
@@ -4633,24 +4634,24 @@ exactly you did? Thanks!"))))
'(?n "n" "Move to the next
match"))
'(?r "r" "\
Replace match but don't move or restore match if already replaced")
- '(?! "all" "Replace all remaining
matches in this buffer")
+ '(?! "!" "Replace all remaining
matches in this buffer")
'(?b "skip buf"
"Skip this buffer and any
remaining matches in it")
(and buffer-file-name
- '(?d "skip dir"
+ '(?d "dir"
"Skip a parent directory
of current file"))
(and (not replaced-this)
- (list ?s (concat (if splice
"disable" "enable")
- " splice")
+ (list ?s (concat (if splice
"no " "")
+ "splice")
(substitute-command-keys "\
Toggle splicing mode (\\[describe-function] el-search-query-replace for
details)")))
- '(?o "show" "\
+ '(?e "edit" "\
Show current replacement in a separate buffer - you can modify it there")
- '(?e "ediff" "\
+ '(?E "Ediff" "\
Ediff match with replacement")
'(?q "quit")
'(?\r "quit")
- '(?S "Search" "\
+ '(?S "S" "\
Switch to driving search. Useful to reposition search head.")))))))))
(when (and
stop-for-comments
@@ -4757,9 +4758,9 @@ Replace all matches in all buffers"))))
el-search--current-query-replace)
splice)
nil)
- (?o (funcall edit-and-update)
+ (?e (funcall edit-and-update)
nil)
- (?e (funcall edit-and-update
'ediff-only)
+ (?E (funcall edit-and-update
'ediff-only)
nil)
((or ?q ?\C-g ?\r) (signal
'quit t))
(?S
- [elpa] externals/el-search 4b934f1 238/332: * el-search/el-search.el: Skip over #N read syntaxes, (continued)
- [elpa] externals/el-search 4b934f1 238/332: * el-search/el-search.el: Skip over #N read syntaxes, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 01d4431 269/332: [el-search] Don't initially fold El Occur buffers, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1169ef1 294/332: [el-search] Add accessible buffer area to a validity check, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c0947c3 295/332: [el-search] Minibuffer pattern prompt hints part 1: preparations, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 749aa0c 300/332: [el-search] Improvements for 'change' and 'changed', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e522b71 305/332: [el-search] Enhance docstring of el-search-occur-mode, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search fdc4663 308/332: [el-search] Bump version to 1.11.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e790747 309/332: [el-search] Fix quits in minibuffer in emacs -nw, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 39da179 313/332: [el-search] Minibuffer pattern prompt hints part 3, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 01c663b 315/332: [el-search] Make el-search-query-replace resumable, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c95de2b 317/332: [el-search] Shorten el-search-query-replace prompt again,
Stefan Monnier <=
- [elpa] externals/el-search 76d63d9 326/332: [el-search] Extend possible search domains, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0212cf9 328/332: * packages/el-search/el-search.el: New command el-search-repository, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6df1362 332/332: * .gitignore: New file, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6c0475e 212/332: Allow to save the current el-search to a register, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 7c19468 215/332: Fix el-search's to register save when no search started yet, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c7709ab 233/332: Fix el-search's check for buffers visiting a given file, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cda69ae 230/332: * el-search/el-search-x.el: New user option `el-search-lazy-l', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ce8835b 242/332: [el-search] Factor out `el-search-backward', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search dfaa7f2 244/332: [el-search] Some more minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a6c23b5 250/332: * el-search/el-search.el: Correct NOERROR argument uses, Stefan Monnier, 2020/12/01