[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master fcef913 023/184: swiper-isearch: Fix regexes in "ignore-or
From: |
Oleh Krehel |
Subject: |
[elpa] master fcef913 023/184: swiper-isearch: Fix regexes in "ignore-order" case |
Date: |
Wed, 16 Oct 2019 13:14:42 -0400 (EDT) |
branch: master
commit fcef913e82d8242575612fd934ca17762abd872c
Author: Muir Manders <address@hidden>
Commit: Oleh Krehel <address@hidden>
swiper-isearch: Fix regexes in "ignore-order" case
Don't use regexp-opt since that escapes regexes. Instead, escape
invalid regexes and just join each aprt on "|".
Fixes #2164
---
swiper.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/swiper.el b/swiper.el
index 02fc34f..da0f19c 100644
--- a/swiper.el
+++ b/swiper.el
@@ -1363,7 +1363,10 @@ See `ivy-format-functions-alist' for further
information."
(re
(if (stringp re-full)
re-full
- (regexp-opt (delq nil (mapcar (lambda (x) (and (cdr x) (car
x))) re-full)))))
+ (mapconcat
+ #'ivy--regex-or-literal
+ (delq nil (mapcar (lambda (x) (and (cdr x) (car x))) re-full))
+ "\\|")))
(cands (swiper--isearch-function-1 re swiper--isearch-backward)))
(when (consp re-full)
(setq cands (swiper--isearch-filter-ignore-order re-full cands)))
- [elpa] master b9bb7c6 140/184: ivy.el (ivy-configure): New function to configure many things at once, (continued)
- [elpa] master b9bb7c6 140/184: ivy.el (ivy-configure): New function to configure many things at once, Oleh Krehel, 2019/10/16
- [elpa] master e3dabec 143/184: counsel.el: Use ivy-configure :unwind-fn, Oleh Krehel, 2019/10/16
- [elpa] master f16ac0e 148/184: ivy.el (ivy--format): Set case-fold-search, Oleh Krehel, 2019/10/16
- [elpa] master 501ac71 151/184: ivy.el (ivy-occur-revert-buffer): Re-use ivy-highlight-grep-commands, Oleh Krehel, 2019/10/16
- [elpa] master 6b0c41b 167/184: ivy.el (ivy-sort-file-function-using-ido): Make obsolete, Oleh Krehel, 2019/10/16
- [elpa] master 22cc602 160/184: counsel.el (counsel-find-symbol): Should not show up in counsel-M-x, Oleh Krehel, 2019/10/16
- [elpa] master b85f857 166/184: .github/FUNDING.yml: Add github, Oleh Krehel, 2019/10/16
- [elpa] master 722250c 162/184: counsel.el (counsel-imenu-action): Handle nil case, Oleh Krehel, 2019/10/16
- [elpa] master 9970ae6 180/184: counsel.el (counsel-read-directory-name): Add, Oleh Krehel, 2019/10/16
- [elpa] master 7054901 176/184: ivy.el (ivy-occur-revert-buffer): Make more generic, Oleh Krehel, 2019/10/16
- [elpa] master fcef913 023/184: swiper-isearch: Fix regexes in "ignore-order" case,
Oleh Krehel <=
- [elpa] master 0b85d9d 030/184: counsel.el (counsel-at-git-issue-p): Add vc-git-log-view-mode, Oleh Krehel, 2019/10/16
- [elpa] master 2db2c51 050/184: counsel.el (counsel-find-file-mkdir-action): make parents too, Oleh Krehel, 2019/10/16
- [elpa] master f90bc8c 164/184: ivy.el (ivy-configure): Add :height, Oleh Krehel, 2019/10/16
- [elpa] master 09c40fc 175/184: swiper.el (swiper--occur-insert-lines): Simplify, Oleh Krehel, 2019/10/16
- [elpa] master c69deb2 179/184: ivy.el: "~~" now works as expected for /sudo::, Oleh Krehel, 2019/10/16
- [elpa] master 24a6354 170/184: ivy.el (ivy--format): Improve docstring, Oleh Krehel, 2019/10/16
- [elpa] master 0d842e3 062/184: ivy.el (ivy-switch-buffer): Clean up, Oleh Krehel, 2019/10/16
- [elpa] master 560957f 074/184: Check if ivy--done is accepting a string., Oleh Krehel, 2019/10/16
- [elpa] master 3b4956a 123/184: counsel.el (counsel-evil-registers-height): Remove obsolete var, Oleh Krehel, 2019/10/16
- [elpa] master a1bb702 128/184: Nicer message when counsel-git-grep finds no match, Oleh Krehel, 2019/10/16