[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 94b6a83 26/31: Don't error on bad regex
From: |
Oleh Krehel |
Subject: |
[elpa] master 94b6a83 26/31: Don't error on bad regex |
Date: |
Fri, 01 May 2015 14:29:03 +0000 |
branch: master
commit 94b6a839177f15bbb84045ad027172b674e5c951
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Don't error on bad regex
* ivy.el (ivy--filter): When on bad regex, just set the result to nil.
Fixes #70
---
ivy.el | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ivy.el b/ivy.el
index ffc1913..e0adecd 100644
--- a/ivy.el
+++ b/ivy.el
@@ -890,12 +890,13 @@ CANDIDATES are assumed to be static."
(res candidates))
(dolist (re re-list)
(setq res
- (funcall
- (if (cdr re)
- #'cl-remove-if-not
- #'cl-remove-if)
- `(lambda (x) (string-match ,(car re) x))
- res)))
+ (ignore-errors
+ (funcall
+ (if (cdr re)
+ #'cl-remove-if-not
+ #'cl-remove-if)
+ `(lambda (x) (string-match ,(car re) x))
+ res))))
res))))
(tail (nthcdr ivy--index ivy--old-cands))
idx)
- [elpa] master 7299950 16/31: ivy.el: Fixup docstrings, (continued)
- [elpa] master 7299950 16/31: ivy.el: Fixup docstrings, Oleh Krehel, 2015/05/01
- [elpa] master aa9d4a7 17/31: ivy.el (ivy-re-builders-alist): Improve doc, Oleh Krehel, 2015/05/01
- [elpa] master 0f141f5 18/31: counsel.el (counsel-git-grep): Add optional initial-input, Oleh Krehel, 2015/05/01
- [elpa] master 23ffa25 19/31: Bind "TAB" to do partial completion, Oleh Krehel, 2015/05/01
- [elpa] master ae2fd1a 21/31: Improve hidden buffer completion further, Oleh Krehel, 2015/05/01
- [elpa] master 5dc26fb 20/31: Improve the completion of hidden buffers, Oleh Krehel, 2015/05/01
- [elpa] master 1332b19 22/31: ivy.el (ivy--exhibit): Fixup last commit, Oleh Krehel, 2015/05/01
- [elpa] master 6b2e95a 24/31: Add gamma-correction to alpha-blending, Oleh Krehel, 2015/05/01
- [elpa] master a868705 23/31: colir.el: Add two additional blend algorithms, Oleh Krehel, 2015/05/01
- [elpa] master 7bd6003 25/31: Update and improve faces, Oleh Krehel, 2015/05/01
- [elpa] master 94b6a83 26/31: Don't error on bad regex,
Oleh Krehel <=
- [elpa] master 0dd6c5a 27/31: ivy.el (ivy--regex): Fixup, Oleh Krehel, 2015/05/01
- [elpa] master fc84e0d 28/31: ivy.el (ivy-read): Reset `ivy-text' earlier, Oleh Krehel, 2015/05/01
- [elpa] master 5a1bd78 29/31: Improve TRAMP completion for ivy-mode, Oleh Krehel, 2015/05/01
- [elpa] master 5a2e0fd 30/31: Allow for "/ssh:user@" as well as for "/ssh:", Oleh Krehel, 2015/05/01
- [elpa] master 4137447 31/31: Merge commit '5a2e0fd355fea83e3c172402b965a1aa826fcc0c' from swiper, Oleh Krehel, 2015/05/01