[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 9ffa9c7 121/272: ivy.el (ivy--regex): Don't consider \\(?.
From: |
Oleh Krehel |
Subject: |
[elpa] master 9ffa9c7 121/272: ivy.el (ivy--regex): Don't consider \\(?...\) a group |
Date: |
Mon, 25 Apr 2016 10:13:20 +0000 |
branch: master
commit 9ffa9c7b10f91439be8c5deadc345d7b641302d6
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy--regex): Don't consider \\(?...\) a group
* ivy-test.el (ivy--regex): Add test.
Fixes #393
---
ivy-test.el | 5 +++++
ivy.el | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ivy-test.el b/ivy-test.el
index 807f8ad..e857449 100644
--- a/ivy-test.el
+++ b/ivy-test.el
@@ -100,6 +100,11 @@
"and I am"
"your king."))))
+(ert-deftest ivy--regex ()
+ (should (equal (ivy--regex
+ "\\(?:interactive\\|swiper\\) \\(?:list\\|symbol\\)")
+
"\\(\\(?:interactive\\|swiper\\)\\).*?\\(\\(?:list\\|symbol\\)\\)")))
+
(ert-deftest ivy--regex-fuzzy ()
(should (string= (ivy--regex-fuzzy "tmux")
"\\(t\\).*\\(m\\).*\\(u\\).*\\(x\\)"))
diff --git a/ivy.el b/ivy.el
index 5630f1b..84d4af7 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1655,7 +1655,7 @@ When GREEDY is non-nil, join words in a greedy way."
(setq ivy--subexps (length subs))
(mapconcat
(lambda (x)
- (if (string-match "\\`\\\\(.*\\\\)\\'" x)
+ (if (string-match "\\`\\\\([^?].*\\\\)\\'" x)
x
(format "\\(%s\\)" x)))
subs
- [elpa] master d8f04f0 061/272: Add melpa version badge, (continued)
- [elpa] master d8f04f0 061/272: Add melpa version badge, Oleh Krehel, 2016/04/25
- [elpa] master 00b009e 101/272: ivy.el (ivy-next-line-or-history): Update, Oleh Krehel, 2016/04/25
- [elpa] master 142306e 069/272: counsel.el (counsel-git-stash): New command, Oleh Krehel, 2016/04/25
- [elpa] master 7869996 102/272: swiper.el: Remove obsolete faces, Oleh Krehel, 2016/04/25
- [elpa] master ded0923 088/272: Customize ivy-occur per command with ivy-set-occur, Oleh Krehel, 2016/04/25
- [elpa] master 0744f57 139/272: counsel.el (counsel-git-grep-occur): Fix greedy-nongreedy bug, Oleh Krehel, 2016/04/25
- [elpa] master 57b6651 118/272: ivy.el: Fix defcustom :type for several variables, Oleh Krehel, 2016/04/25
- [elpa] master 6fbab50 128/272: swiper.el (swiper-all): Now auto-updates position, Oleh Krehel, 2016/04/25
- [elpa] master 26c8246 131/272: counsel.el (counsel-recoll): add unwind, Oleh Krehel, 2016/04/25
- [elpa] master 87da3a2 132/272: counsel.el (counsel-async-split-string-re): New defvar, Oleh Krehel, 2016/04/25
- [elpa] master 9ffa9c7 121/272: ivy.el (ivy--regex): Don't consider \\(?...\) a group,
Oleh Krehel <=
- [elpa] master 71bb1c0 144/272: ivy.el (ivy-alt-done): Simplify, Oleh Krehel, 2016/04/25
- [elpa] master e12ff84 125/272: counsel.el (counsel-list-processes-action-switch): Improve, Oleh Krehel, 2016/04/25
- [elpa] master 1737ced 064/272: ivy.el (ivy-inhibit-action): New variable, Oleh Krehel, 2016/04/25
- [elpa] master 05a7b61 070/272: ivy.el (ivy--reset-state): Support a list of symbols as collection, Oleh Krehel, 2016/04/25
- [elpa] master 65ec32c 080/272: README.md: mention the manual more prominently, Oleh Krehel, 2016/04/25
- [elpa] master 4af5c2e 115/272: Add `counsel-locate-cmd-mdfind`, Oleh Krehel, 2016/04/25
- [elpa] master 022e658 090/272: When in prog-mode, "M-n" should wrap input with "\b", Oleh Krehel, 2016/04/25
- [elpa] master 9db8308 103/272: counsel.el: Organize the file with outlines, Oleh Krehel, 2016/04/25
- [elpa] master 1c04fb8 126/272: Add ivy-fixed-height-minibuffer, Oleh Krehel, 2016/04/25
- [elpa] master 7a0b243 130/272: Give ivy-read-read-action enough minibuffer space, Oleh Krehel, 2016/04/25