[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master de5833e 51/57: Don't error on incomplete bad regexp in cou
|
From: |
Oleh Krehel |
|
Subject: |
[elpa] master de5833e 51/57: Don't error on incomplete bad regexp in counsel-git-grep |
|
Date: |
Tue, 19 May 2015 14:21:40 +0000 |
branch: master
commit de5833ee3de2e6a15ec0ac8cd887fc7bef97cbf3
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Don't error on incomplete bad regexp in counsel-git-grep
counsel.el (counsel-git-grep-matcher): Update.
---
counsel.el | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/counsel.el b/counsel.el
index ea5496e..194322f 100644
--- a/counsel.el
+++ b/counsel.el
@@ -250,19 +250,20 @@
:unwind #'swiper--cleanup)))
(defun counsel-git-grep-matcher (x)
- (when (string-match "^[^:]+:[^:]+:" x)
- (setq x (substring x (match-end 0)))
- (if (stringp ivy--old-re)
- (string-match ivy--old-re x)
- (let ((res t))
- (dolist (re ivy--old-re)
- (setq res
- (and res
- (ignore-errors
- (if (cdr re)
- (string-match (car re) x)
- (not (string-match (car re) x)))))))
- res))))
+ (ignore-errors
+ (when (string-match "^[^:]+:[^:]+:" x)
+ (setq x (substring x (match-end 0)))
+ (if (stringp ivy--old-re)
+ (string-match ivy--old-re x)
+ (let ((res t))
+ (dolist (re ivy--old-re)
+ (setq res
+ (and res
+ (ignore-errors
+ (if (cdr re)
+ (string-match (car re) x)
+ (not (string-match (car re) x)))))))
+ res)))))
(defun counsel-locate-function (str &rest _u)
(if (< (length str) 3)
- [elpa] master 10f9954 50/57: counsel.el (counsel-git-grep): Warn if not in a repository, (continued)
- [elpa] master 10f9954 50/57: counsel.el (counsel-git-grep): Warn if not in a repository, Oleh Krehel, 2015/05/19
- [elpa] master 2cedcf5 37/57: Introduce :matcher for counsel-git-grep, Oleh Krehel, 2015/05/19
- [elpa] master 93faef3 41/57: ivy.el (ivy-delete-char): Add and bind to "C-d", Oleh Krehel, 2015/05/19
- [elpa] master 8630048 47/57: Fixed ivy--preselect-index on windows where the drives folders ends with a backslash (C:\, D:\), Oleh Krehel, 2015/05/19
- [elpa] master 1c0703e 36/57: Forward to minibuffer-complete for filenames only if "^/", Oleh Krehel, 2015/05/19
- [elpa] master 70c8c8a 40/57: ivy.el (ivy-switch-buffer): Preselect other-buffer, Oleh Krehel, 2015/05/19
- [elpa] master 9da8e53 54/57: counsel.el (counsel-info-lookup-symbol): Turn on sorting, Oleh Krehel, 2015/05/19
- [elpa] master e0b6c0c 46/57: Update the way spaces are quoted using ivy, Oleh Krehel, 2015/05/19
- [elpa] master 323efda 38/57: counsel-git-grep now works with ivy-resume, Oleh Krehel, 2015/05/19
- [elpa] master 88f4508 49/57: ivy.el (ivy-kill-word): Add and bind to "M-d", Oleh Krehel, 2015/05/19
- [elpa] master de5833e 51/57: Don't error on incomplete bad regexp in counsel-git-grep,
Oleh Krehel <=
- [elpa] master 89b9e9a 48/57: README.md: Add sample init, Oleh Krehel, 2015/05/19
- [elpa] master 28cb795 53/57: Don't try to call permanent action if there's none, Oleh Krehel, 2015/05/19
- [elpa] master 75a059c 44/57: Allow to recenter with "C-l" during counsel-git-grep, Oleh Krehel, 2015/05/19
- [elpa] master 4f75381 55/57: When building a regex, consider ^ only at start, Oleh Krehel, 2015/05/19
- [elpa] master 5afceff 52/57: ivy.el (ivy-forward-char): Add and bind to "C-f", Oleh Krehel, 2015/05/19
- [elpa] master 155f2a6 57/57: Merge commit 'bc335af4d94d80d3605b66ed51a15d2476ad2179' from swiper, Oleh Krehel, 2015/05/19
- [elpa] master bc335af 56/57: Fixup compilation warnings, Oleh Krehel, 2015/05/19