[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/mheerdegen-preview 73bca9f 12/32: WIP [el-search] Fix mor
From: |
Michael Heerdegen |
Subject: |
[elpa] scratch/mheerdegen-preview 73bca9f 12/32: WIP [el-search] Fix more "redundant _ pattern" cases |
Date: |
Sat, 20 Oct 2018 18:18:59 -0400 (EDT) |
branch: scratch/mheerdegen-preview
commit 73bca9f0db56dc93b22559d1fcb382a5b82d4c7a
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
WIP [el-search] Fix more "redundant _ pattern" cases
---
packages/el-search/el-search-x.el | 8 +++++---
packages/el-search/el-search.el | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/packages/el-search/el-search-x.el
b/packages/el-search/el-search-x.el
index a2f37c4..03b3acf 100644
--- a/packages/el-search/el-search-x.el
+++ b/packages/el-search/el-search-x.el
@@ -104,8 +104,10 @@ Example: the pattern
(append '(1 2 3) x (app car-safe 7))
matches the list (1 2 3 4 5 6 7 8 9), binding `x' to (4 5 6)."
- (if (null patterns)
- '(pred null)
+ (cond
+ ((null patterns) '(pred null))
+ ((equal patterns '(_)) '(pred listp))
+ (t
(pcase-let ((`(,pattern . ,more-patterns) patterns))
(cond
((null more-patterns) pattern)
@@ -115,7 +117,7 @@ matches the list (1 2 3 4 5 6 7 8 9), binding `x' to (4 5
6)."
(el-search-make-matcher pattern)
(el-search-make-matcher (car
more-patterns)))
`(,,pattern ,,(car more-patterns)))))
- (t `(append ,pattern (append ,@more-patterns)))))))
+ (t `(append ,pattern (append ,@more-patterns))))))))
(defcustom el-search-lazy-l t
"Whether to interpret symbols and strings specially in `l'.
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 4faba21..05f5de8 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -1095,7 +1095,7 @@ N times."
(defvar warning-suppress-log-types)
(let ((byte-compile-debug t) ;make undefined pattern types raise an error
(warning-suppress-log-types '((bytecomp)))
- (pattern-is-catchall (eq pattern '_)))
+ (pattern-is-catchall (and (symbolp pattern) (not (keywordp
pattern)))))
(byte-compile
`(lambda (,(if pattern-is-catchall '_ expression))
,(if pattern-is-catchall
- [elpa] branch scratch/mheerdegen-preview created (now 009dc4d), Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview d91a3bb 02/32: WIP: Add diverse "sloppy" pattern types, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview 9fce13a 05/32: WIP: New :key arg for "filename" and new pattern types "file" and "dir", Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview b8542ca 04/32: WIP: New package "gnus-article-notes", Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview 73bca9f 12/32: WIP [el-search] Fix more "redundant _ pattern" cases,
Michael Heerdegen <=
- [elpa] scratch/mheerdegen-preview d27e751 19/32: WIP [el-search] Adjust prev/next match commands for search and occur, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview 562b2db 18/32: WIP [el-search] Fix search setup when occur flag bound, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview 1f46601 15/32: WIP: Additions to "Mb hints", Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview a8483cd 22/32: WIP: [el-search] Fine tune separator for splicing replace, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview 5bdc539 27/32: WIP: Include leading comments in occur defun context, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview f11f566 31/32: WIP: Small fix in el-search--changed-files-in-repo, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview fc2c159 29/32: WIP: Fix C-A and C-J after finished single-buffer search, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview d6a3158 01/32: WIP: [el-search] Fix nested match issues in *El Occur*, Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview 74cc15a 08/32: WIP: New command 'el-search-repository', Michael Heerdegen, 2018/10/20
- [elpa] scratch/mheerdegen-preview e43d95b 10/32: WIP [el-search] Implement 'el-search-keyboard-quit', Michael Heerdegen, 2018/10/20