[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 8583d46 191/332: Fix resuming a single-buffer
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 8583d46 191/332: Fix resuming a single-buffer query-replace |
Date: |
Tue, 1 Dec 2020 15:48:42 -0500 (EST) |
branch: externals/el-search
commit 8583d46de3893536a8a62f4ce94a76ec184bdf68
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
Fix resuming a single-buffer query-replace
---
el-search.el | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/el-search.el b/el-search.el
index ef75a66..be58eae 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.4.0.6
+;; Version: 1.4.0.7
;; Package-Requires: ((emacs "25") (stream "2.2.4"))
@@ -3122,14 +3122,12 @@ the list's elements are inserted."))
nbr-replaced
(if (zerop nbr-skipped) ""
(format " (%d skipped)" nbr-skipped))))))))
- (if (not multiple)
- (funcall replace-in-current-buffer)
- (while (and
- (not done)
- (progn (el-search-continue-search)
- (and el-search--success (not el-search--wrap-flag))))
- (funcall replace-in-current-buffer)
- (unless replace-all-and-following (setq replace-all nil))))
+ (while (and
+ (not done)
+ (progn (el-search-continue-search)
+ (and el-search--success (not el-search--wrap-flag))))
+ (funcall replace-in-current-buffer)
+ (unless replace-all-and-following (setq replace-all nil)))
(message "Replaced %d matches in %d buffers" nbr-replaced-total
nbr-changed-buffers))))
(defun el-search-query-replace--read-args ()
@@ -3226,8 +3224,6 @@ query-replace all matches following point in the current
buffer."
(eq (el-search-head-buffer search-head) (current-buffer))
(equal from-pattern (el-search-object-pattern el-search--current-search))
(eq last-command 'el-search-pattern)
- ;; A `el-search-this-sexp' that wasn't activated doesn't count
- (el-search-object-last-match el-search--current-search)
(prog1 t
(el-search--message-no-log "Using the current search to drive
query-replace...")
(sit-for 1.))))))
- [elpa] externals/el-search 4202501 148/332: el-search version 1.3: Lots of fixes and improvements, (continued)
- [elpa] externals/el-search 4202501 148/332: el-search version 1.3: Lots of fixes and improvements, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d54491c 147/332: Add a FILE argument to `el-search-dired-marked-files', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a26b6e0 152/332: Reset wrap flag even when no match, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6919e8d 141/332: Also count pattern types starting with "_" as internal, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b8e3812 144/332: Improve half-baked introduction of key bindings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e96c054 156/332: Handle read errors when reading and validating replacement, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6f0f22c 155/332: Some details, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6e6013a 159/332: Fix and speed up the `change' pattern type, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c878a24 173/332: Fix "Make amount of context around occur matches adjustable", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f6b1aec 180/332: Some details, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8583d46 191/332: Fix resuming a single-buffer query-replace,
Stefan Monnier <=
- [elpa] externals/el-search 365f93f 197/332: * el-search/el-search.el: Some buffer display related minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c69dd52 205/332: * el-search/el-search.el: Some minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c41288f 208/332: Make el-search key binding installation more flexible, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8d20f8a 217/332: Add face `el-search-highlight-in-prompt-face', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 75f94f9 218/332: Improve quit/error handling in el-search-query-replace, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b278fb7 219/332: Update a variable when splicing mode is toggled, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8175417 237/332: * el-search/el-search.el: More minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1f81442 241/332: [el-search] Improve forward search functions, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5c3bd4e 247/332: [el-search] Add bindings for first/last match jumping, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3699425 246/332: [el-search] Add command 'el-search-last-buffer-match', Stefan Monnier, 2020/12/01