[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 14c7cf9 074/332: el-search--check-pattern-arg
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 14c7cf9 074/332: el-search--check-pattern-args: make arg TYPE a string |
Date: |
Tue, 1 Dec 2020 15:48:14 -0500 (EST) |
branch: externals/el-search
commit 14c7cf94f500b8e59b98a3165c12e2f9a91f01c4
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
el-search--check-pattern-args: make arg TYPE a string
---
el-search.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/el-search.el b/el-search.el
index 764d77e..84fb1c8 100644
--- a/el-search.el
+++ b/el-search.el
@@ -546,11 +546,11 @@ return nil (no error)."
(defun el-search--check-pattern-args (type args predicate &optional message)
"Check whether all ARGS fulfill PREDICATE.
-Raise an error if not. TYPE and optional argument MESSAGE are
-used to construct the error message."
+Raise an error if not. The string arguments TYPE and optional
+MESSAGE are used to construct the error message."
(mapc (lambda (arg)
(unless (funcall predicate arg)
- (error (concat "Pattern `%S': "
+ (error (concat "Pattern `%s': "
(or message (format "argument doesn't fulfill %S"
predicate))
": %S")
type arg)))
@@ -617,7 +617,7 @@ matches the list (1 2 3 4 5 6 7 8 9) and binds `x' to (4 5
6)."
(el-search-defpattern string (&rest regexps)
"Matches any string that is matched by all REGEXPS."
- (el-search--check-pattern-args 'string regexps #'el-search--stringish-p
+ (el-search--check-pattern-args "string" regexps #'el-search--stringish-p
"Argument not a string")
`(and (pred stringp)
,@(mapcar (lambda (thing) `(pred (el-search--smart-string-match-p
@@ -626,7 +626,7 @@ matches the list (1 2 3 4 5 6 7 8 9) and binds `x' to (4 5
6)."
(el-search-defpattern symbol (&rest regexps)
"Matches any symbol whose name is matched by all REGEXPS."
- (el-search--check-pattern-args 'symbol regexps #'el-search--stringish-p
+ (el-search--check-pattern-args "symbol" regexps #'el-search--stringish-p
"Argument not a string")
`(and (pred symbolp)
(app symbol-name (string ,@regexps))))
@@ -684,7 +684,7 @@ REGEXP can also be a symbol, in which case
(concat \"^\" (symbol-name regexp) \"$\")
is used as regular expression."
- (el-search--check-pattern-args 'source (list regexp) #'el-search--stringish-p
+ (el-search--check-pattern-args "source" (list regexp)
#'el-search--stringish-p
"Argument not a string")
`(pred (el-search--match-symbol-file ,(if (symbolp regexp) (symbol-name
regexp) regexp))))
@@ -716,7 +716,7 @@ matches any of these expressions:
[(control ?s)]"
(when (eq (car-safe key-sequence) 'kbd)
(setq key-sequence (kbd (cadr key-sequence))))
- (el-search--check-pattern-args 'keys (list key-sequence) (lambda (x) (or
(stringp x) (vectorp x)))
+ (el-search--check-pattern-args "keys" (list key-sequence) (lambda (x) (or
(stringp x) (vectorp x)))
"argument not a string or vector")
`(pred (el-search--match-key-sequence ,key-sequence)))
- [elpa] externals/el-search 7e13746 058/332: When coming from isearch, don't move to other end, (continued)
- [elpa] externals/el-search 7e13746 058/332: When coming from isearch, don't move to other end, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5837187 059/332: el-search: bump version to 0.1.3, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 108466e 061/332: Support highlighting of all visible matches, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 177d82e 063/332: use uninterned symbol in `el-search--matcher', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5517384 065/332: Improve doc of el-search-this-expression-identifier., Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1e97c09 069/332: Fix for non-interactive calls of el-search-pattern, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c0efb8d 067/332: New user option: el-search-smart-case-fold-search, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 9f8b3d2 071/332: New function el-search--macroexpand-1 for debugging, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 975e2e5 073/332: Rewrite `string' pattern definition, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2dc14bb 075/332: Rewrite replacement layout restoration, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 14c7cf9 074/332: el-search--check-pattern-args: make arg TYPE a string,
Stefan Monnier <=
- [elpa] externals/el-search fc46701 076/332: Replacing: make C-g an alternative key for quitting, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a61e0eb 079/332: Handle replacements containing another match, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4325b91 080/332: Rename two functions, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ba17f50 086/332: Give el-search--s a more meaningful name, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d25f4d8 082/332: Address compiler warnings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2358b72 088/332: Small fix in el-search--setup-minibuffer, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 75b5849 083/332: Clarify the operation scope of replacing, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e1797d3 087/332: Use `pp-to-string' to print replacement expression, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ef5faf2 095/332: Improve history handling, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4d6b361 097/332: el-search--ensure-sexp-start: don't assume point-min==1, Stefan Monnier, 2020/12/01