[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 42c776a 207/332: * el-search/el-search.el: Tw
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 42c776a 207/332: * el-search/el-search.el: Tweak el-search-jump-to-search-head |
Date: |
Tue, 1 Dec 2020 15:48:46 -0500 (EST) |
branch: externals/el-search
commit 42c776a64508de378f2cd268af1ba7d097abcb20
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
* el-search/el-search.el: Tweak el-search-jump-to-search-head
(el-search-jump-to-search-head): Don't use :annotation-function -
directly add search description to the candidate instead so that the
user can use completion on it. Improve docstring.
---
el-search.el | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/el-search.el b/el-search.el
index f84c6eb..d3c67df 100644
--- a/el-search.el
+++ b/el-search.el
@@ -1983,30 +1983,33 @@ local binding of `window-scroll-functions'."
(defun el-search-jump-to-search-head (&optional previous-search)
"Switch to current search buffer and go to the last match.
-With prefix arg, prompt for a prior search to resume, and make
-that the current search."
+With argument PREVIOUS-SEARCH non-nil (the prefix argument in an
+interactive call), prompt for a prior search to resume, and make
+that the current search. In a non-interactive call,
+PREVIOUS-SEARCH can directly specify an el-search-object to make
+current."
(interactive "P")
(when previous-search
;; FIXME: would it be better to include some context around the search
;; head - or to even use an overview buffer for selection?
- (let ((entry (ring-ref
- el-search-history
- (string-to-number
- (let ((completion-extra-properties
- `(:annotation-function
- ,(lambda (elt)
- (concat
- " "
- (el-search--get-search-description-string
- (ring-ref el-search-history (string-to-number
elt))
- t))))))
- (completing-read
- "Resume previous search: "
- (mapcar #'prin1-to-string
- (number-sequence 0 (1- (ring-length
el-search-history))))))))))
- (setq el-search--current-search entry)
- (setq el-search--success t)
- (el-search--set-wrap-flag nil)))
+ (setq el-search--current-search
+ (if (el-search-object-p previous-search) previous-search
+ (ring-ref
+ el-search-history
+ (let ((input
+ (completing-read
+ "Resume previous search: "
+ (mapcar
+ (lambda (n) (format "%d - %s"
+ n
+ (el-search--get-search-description-string
+ (ring-ref el-search-history n)
+ t)))
+ (number-sequence 0 (1- (ring-length
el-search-history)))))))
+ (string-match "\\`\\([0-9]+\\) - " input)
+ (string-to-number (match-string 1 input))))))
+ (setq el-search--success t)
+ (el-search--set-wrap-flag nil))
(el-search-compile-pattern-in-search el-search--current-search)
(if-let ((search el-search--current-search)
(current-head (el-search-object-head search))
- [elpa] externals/el-search 817c902 123/332: Document change-revision transformer function; make a defcustom, (continued)
- [elpa] externals/el-search 817c902 123/332: Document change-revision transformer function; make a defcustom, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2d6aad6 132/332: Explicitly `error' when trying to jump to invalid search head, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8875d2a 137/332: Avoid infinite recursion in circular programs, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f02e86f 142/332: New command `el-search-from-beginning', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4b6a363 138/332: Improve handling of reader errors in el-search-atom-list, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 806bfc4 157/332: Add new command `el-search-this-sexp', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c66d1da 160/332: Make the el-search-object struct contain an alist of properties, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4a6c3e2 162/332: Some details, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d412688 199/332: Update copyrights of some packages, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cf465e0 203/332: * el-search/el-search.el: Add two more autoload cookies, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 42c776a 207/332: * el-search/el-search.el: Tweak el-search-jump-to-search-head,
Stefan Monnier <=
- [elpa] externals/el-search ce97e9d 108/332: el-search: bump version to 0.2.2, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e5bd647 214/332: * el-search/el-search.el: Work around Emacs Bug#29857, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d995af1 166/332: Don't let el-search-pattern resume a paused search, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ceb23fc 169/332: More multi query-replace related improvements, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1aded2b 172/332: Make amount of context around occur matches adjustable, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search dc1d703 175/332: Require the new rmc.el lib when available, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 419a9c2 176/332: Improve jumping to matches in *El Occur* buffers, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8c3213f 182/332: Bump el-search version to 1.4, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d3eaaf0 198/332: Make the some-context function include an opening backquote, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 85fdccc 202/332: New option value ask-multi for `el-search-auto-save-buffers', Stefan Monnier, 2020/12/01