[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search ca6b9f2 183/332: Add a PROMPT arg to `el-sear
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search ca6b9f2 183/332: Add a PROMPT arg to `el-search--read-pattern-for-interactive' |
Date: |
Tue, 1 Dec 2020 15:48:40 -0500 (EST) |
branch: externals/el-search
commit ca6b9f23936cd2d840a23b7891077e6e12309ec9
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
Add a PROMPT arg to `el-search--read-pattern-for-interactive'
Use it.
---
el-search.el | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/el-search.el b/el-search.el
index e7379a9..824996c 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
+;; Version: 1.4.0.1
;; Package-Requires: ((emacs "25") (stream "2.2.4"))
@@ -645,8 +645,9 @@ nil."
(el-search--pushnew-to-history input histvar)
(if (not (string= input "")) input (car (symbol-value histvar)))))
-(defun el-search--read-pattern-for-interactive ()
- (let* ((input (el-search--read-pattern "El-search pattern: " (car
el-search-pattern-history)))
+(defun el-search--read-pattern-for-interactive (&optional prompt)
+ (let* ((input (el-search--read-pattern (or prompt "El-search pattern: ")
+ (car el-search-pattern-history)))
(pattern (read input)))
;; A very common mistake: input "foo" instead of "'foo"
(el-search--maybe-warn-about-unquoted-symbol pattern)
@@ -2256,7 +2257,7 @@ Prompt for a new pattern and revert the occur buffer."
(interactive (list (let ((el-search--initial-mb-contents
(el-search--pp-to-string
(el-search-object-pattern
el-search-occur-search-object))))
- (el-search--read-pattern-for-interactive))))
+ (el-search--read-pattern-for-interactive "New pattern:
"))))
(setf (el-search-object-pattern el-search-occur-search-object)
new-pattern)
(el-search-compile-pattern-in-search el-search-occur-search-object)
@@ -2629,7 +2630,8 @@ use of `hs-minor-mode' and `orgstruct-mode'."
;;;###autoload
(defun el-search-buffers (pattern)
"Search all live elisp buffers for PATTERN."
- (interactive (list (el-search--read-pattern-for-interactive)))
+ (interactive
+ (list (el-search--read-pattern-for-interactive "Search elisp buffers for
pattern: ")))
(el-search-setup-search
pattern
(lambda ()
@@ -2644,7 +2646,7 @@ use of `hs-minor-mode' and `orgstruct-mode'."
(defun el-search-directory (pattern directory &optional recursively)
"Search all elisp files in DIRECTORY for PATTERN.
With prefix arg RECURSIVELY non-nil, search subdirectories recursively."
- (interactive (list (el-search--read-pattern-for-interactive)
+ (interactive (list (el-search--read-pattern-for-interactive "Search dir for
pattern: ")
(expand-file-name
(read-directory-name (format "el-search directory%s: "
(if current-prefix-arg "
recursively" ""))
@@ -2663,7 +2665,8 @@ With prefix arg RECURSIVELY non-nil, search
subdirectories recursively."
"Search Emacs elisp sources for PATTERN.
This command recursively searches all elisp files under
`source-directory'."
- (interactive (list (el-search--read-pattern-for-interactive)))
+ (interactive (list (el-search--read-pattern-for-interactive
+ "Search Elisp sources for pattern: ")))
(el-search-setup-search
pattern
(lambda ()
@@ -2678,7 +2681,8 @@ This command recursively searches all elisp files under
"Search PATTERN in all elisp files in all directories in `load-path'.
nil elements in `load-path' (standing for `default-directory')
are ignored."
- (interactive (list (el-search--read-pattern-for-interactive)))
+ (interactive (list (el-search--read-pattern-for-interactive
+ "Search load path for pattern: ")))
(el-search-setup-search
pattern
(lambda ()
@@ -2699,7 +2703,8 @@ search directories recursively.
This function uses `el-search-stream-of-directory-files' to
compute a the file stream - see there for a description of
related user options."
- (interactive (list (el-search--read-pattern-for-interactive)
+ (interactive (list (el-search--read-pattern-for-interactive
+ "Search marked files for pattern: ")
(dired-get-marked-files)
current-prefix-arg))
(el-search-setup-search
- [elpa] externals/el-search 644b04d 139/332: el-search: bump version to 1.2.2, (continued)
- [elpa] externals/el-search 644b04d 139/332: el-search: bump version to 1.2.2, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b500266 151/332: Tweak el-search--pp-to-string, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 79095f6 143/332: Improve summary message of `el-search-overview', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3772a97 133/332: Add a helpful comment; bump version to 1.2.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0808109 161/332: Fix el-search--change-p for atoms, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f028826 163/332: Narrow down the semantics of symbol LPATs, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c70b003 164/332: Use stream-x.el, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a4004b3 167/332: Make `el-search-reset-search' modify its argument, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2871f22 178/332: Recover from search head pointing to a killed buffer, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cf5b5a9 177/332: Display an x/y-style match count in the echo area, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ca6b9f2 183/332: Add a PROMPT arg to `el-search--read-pattern-for-interactive',
Stefan Monnier <=
- [elpa] externals/el-search d2b8f84 184/332: New command `el-search-count-matches', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 468745a 185/332: Show match count for `el-search-query-replace', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c80df81 186/332: Fix resuming search in a modified buffer, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0b93a25 188/332: * el-search/el-search.el: Minor tweak., Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 145ce47 102/332: Update copyright, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 24d0638 099/332: Rewrite the `change' and `changed' patterns, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search da31900 146/332: Update some copyrights, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 94b79e5 149/332: Add new pattern type `de-morgan', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3b73e0e 154/332: Extend heuristic matching to top-level sexps, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0cff5d2 153/332: Recompile search pattern when resuming searches, Stefan Monnier, 2020/12/01