[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 35a0776 119/332: Add missing settings of some
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 35a0776 119/332: Add missing settings of some vars when restoring a previous search |
Date: |
Tue, 1 Dec 2020 15:48:25 -0500 (EST) |
branch: externals/el-search
commit 35a07766f3eb59d852bd111cb17915e926000ce3
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
Add missing settings of some vars when restoring a previous search
---
el-search.el | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/el-search.el b/el-search.el
index 9ce2571..e6896a8 100644
--- a/el-search.el
+++ b/el-search.el
@@ -1183,23 +1183,28 @@ the form \(buffer-or-file-name . match-position)."
With prefix arg, prompt for a prior search to resume, and make
that the current search."
(when previous-search
- (setq el-search--current-search
- (car (ring-ref
- el-search-history
- (string-to-number
- (let ((completion-extra-properties
- `(:annotation-function
- ,(lambda (elt)
- (format " Search in %S for %S"
- (el-search-head-buffer
- (el-search-object-head
- (car (ring-ref el-search-history
(string-to-number elt)))))
- (cadr (ring-ref el-search-history
(string-to-number elt))))))))
- (completing-read
- "Resume previous search: "
- (mapcar #'prin1-to-string (number-sequence 0 (1-
(ring-length el-search-history))))))))))
+ (let ((entry (ring-ref
+ el-search-history
+ (string-to-number
+ (let ((completion-extra-properties
+ `(:annotation-function
+ ,(lambda (elt)
+ (format " Search in %S for %S"
+ (el-search-head-buffer
+ (el-search-object-head
+ (car (ring-ref el-search-history
(string-to-number elt)))))
+ (cadr (ring-ref el-search-history
(string-to-number elt))))))))
+ (completing-read
+ "Resume previous search: "
+ (mapcar #'prin1-to-string
+ (number-sequence 0 (1- (ring-length
el-search-history))))))))))
+ (setq el-search--current-search (car entry))
+ (setq el-search--current-pattern (cadr entry)))
(setq el-search--current-matcher
- (el-search-head-matcher (el-search-object-head
el-search--current-search))))
+ (el-search-head-matcher (el-search-object-head
el-search--current-search)))
+ (el-search--pushnew-to-history
+ (el-search--pp-to-string el-search--current-pattern)
+ 'el-search-pattern-history))
(if-let ((search el-search--current-search)
(current-head (el-search-object-head search))
(current-search-buffer (el-search-head-buffer current-head)))
- [elpa] externals/el-search b5b6d83 089/332: Make query-replace accept FROM -> TO style input, (continued)
- [elpa] externals/el-search b5b6d83 089/332: Make query-replace accept FROM -> TO style input, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 68f10d7 091/332: Reduce duration of a `sit-for', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 29d6f46 090/332: Rename a local variable, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5b608a1 094/332: Set initial input for replace when coming from el-search-pattern, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 9c3c04d 093/332: Clean up el-search-read-expression-map; add some doc, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b4e79fb 081/332: Add patterns for character properties, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2dd24a9 096/332: Factor out `el-search--replace-hunk', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 852643e 100/332: Fix some quoting problems in doc strings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2366cda 107/332: Improve `change' and `changed', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 31b9e9d 122/332: Inhibit logging of some messages, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 35a0776 119/332: Add missing settings of some vars when restoring a previous search,
Stefan Monnier <=
- [elpa] externals/el-search c086990 129/332: Extend the heuristic matching approach; complete review, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 57ecb9a 128/332: Fix leaving behind helper buffers, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 10e596b 113/332: Add `el-search--macroexpand', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 70477a2 150/332: Explicitly require pcase, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4b8780f 026/332: allow search wrapping, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 125d653 084/332: Fix el-search--ensure-sexp-start error at bob, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ee096b0 092/332: Make sure not to lose the minibuffer-prompt face, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 80ff841 085/332: Make el-search-pattern accept an optional NO-ERROR arg, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 61c39c3 098/332: el-search version 0.2, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e9c3ed5 032/332: fix el-search-hl-post-command-fun auto-removal, Stefan Monnier, 2020/12/01