emacs-elpa-diffs
[Top][All Lists]
Advanced

[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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]