[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search b278fb7 219/332: Update a variable when splic
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search b278fb7 219/332: Update a variable when splicing mode is toggled |
Date: |
Tue, 1 Dec 2020 15:48:49 -0500 (EST) |
branch: externals/el-search
commit b278fb7a8fb4726baa9c498a160dad4c43f79766
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
Update a variable when splicing mode is toggled
* packages/el-search/el-search.el
(el-search--search-and-replace-pattern): Recompute
`replacement-contains-another-match' when user toggles splicing-mode.
---
el-search.el | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/el-search.el b/el-search.el
index 483b899..2e698f3 100644
--- a/el-search.el
+++ b/el-search.el
@@ -3216,16 +3216,19 @@ Thanks!"))))
(lambda () (el-search--format-replacement
new-expr original-text to-input-string
splice)))
(to-insert (funcall get-replacement-string))
+ (replacement-contains-another-match-p
+ (lambda ()
+ (with-temp-buffer
+ (emacs-lisp-mode)
+ (insert to-insert)
+ (goto-char 1)
+ (el-search--skip-expression new-expr)
+ (condition-case nil
+ (progn (el-search--ensure-sexp-start)
+ (el-search--search-pattern-1
matcher 'noerror))
+ (end-of-buffer nil)))))
(replacement-contains-another-match
- (with-temp-buffer
- (emacs-lisp-mode)
- (insert to-insert)
- (goto-char 1)
- (el-search--skip-expression new-expr)
- (condition-case nil
- (progn (el-search--ensure-sexp-start)
- (el-search--search-pattern-1
matcher 'noerror))
- (end-of-buffer nil))))
+ (funcall replacement-contains-another-match-p))
(do-replace
(lambda ()
(save-excursion
@@ -3296,9 +3299,12 @@ Toggle splicing mode (\\[describe-function]
el-search-query-replace for details)
t)
(?d (call-interactively
#'el-search-skip-directory)
t)
- (?s (cl-callf not splice)
- (setq to-insert (funcall
get-replacement-string))
- nil)
+ (?s
+ (setq splice (not splice)
+ to-insert (funcall
get-replacement-string)
+
replacement-contains-another-match
+ (funcall
replacement-contains-another-match-p))
+ nil)
(?o
;; FIXME: Should we allow to edit
the replacement?
(let* ((buffer (get-buffer-create
- [elpa] externals/el-search 6f0f22c 155/332: Some details, (continued)
- [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, 2020/12/01
- [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 <=
- [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
- [elpa] externals/el-search cf68daf 249/332: [el-search] Avoid most calls to 'scan-sexps', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 894f8b1 254/332: [el-search] More minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6c5a6b4 265/332: [el-search] Fix an infloop in el-search--search-pattern-1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b830be5 263/332: [el-search] Some scrolling tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e60f228 267/332: [el-search] Don't try to kill modified buffers, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 34f734e 258/332: [el-search] Add special scroll commands, Stefan Monnier, 2020/12/01