[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1da8b6c 086/348: Fix foo!bar syntax for swiper
From: |
Oleh Krehel |
Subject: |
[elpa] master 1da8b6c 086/348: Fix foo!bar syntax for swiper |
Date: |
Sat, 8 Apr 2017 11:03:33 -0400 (EDT) |
branch: master
commit 1da8b6c44a94900c635531791e045493d90fc82d
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix foo!bar syntax for swiper
* swiper.el (swiper--re-builder):
(swiper--update-input-ivy): Take care not to call
`replace-regexp-in-string' on a cons cell.
Fixes #565
---
swiper.el | 48 ++++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
diff --git a/swiper.el b/swiper.el
index 101bc2d..768332d 100644
--- a/swiper.el
+++ b/swiper.el
@@ -397,23 +397,30 @@ When REVERT is non-nil, regenerate the current
*ivy-occur* buffer."
"Transform STR into a swiper regex.
This is the regex used in the minibuffer where candidates have
line numbers. For the buffer, use `ivy--regex' instead."
- (replace-regexp-in-string
- "\t" " "
- (cond
- ((equal str "")
- "")
- ((equal str "^")
- (setq ivy--subexps 0)
- ".")
- ((string-match "^\\^" str)
- (setq ivy--old-re "")
- (let ((re (ivy--regex-plus (substring str 1))))
- (if (zerop ivy--subexps)
- (prog1 (format "^ ?\\(%s\\)" re)
- (setq ivy--subexps 1))
- (format "^ %s" re))))
- (t
- (ivy--regex-plus str)))))
+ (let ((re (cond
+ ((equal str "")
+ "")
+ ((equal str "^")
+ (setq ivy--subexps 0)
+ ".")
+ ((string-match "^\\^" str)
+ (setq ivy--old-re "")
+ (let ((re (ivy--regex-plus (substring str 1))))
+ (if (zerop ivy--subexps)
+ (prog1 (format "^ ?\\(%s\\)" re)
+ (setq ivy--subexps 1))
+ (format "^ %s" re))))
+ (t
+ (ivy--regex-plus str)))))
+ (cond ((stringp re)
+ (replace-regexp-in-string "\t" " " re))
+ ((and (consp re)
+ (consp (car re)))
+ (setf (caar re)
+ (replace-regexp-in-string "\t" " " (caar re)))
+ re)
+ (t
+ (error "unexpected")))))
(defvar swiper-history nil
"History for `swiper'.")
@@ -507,10 +514,11 @@ Matched candidates should have `swiper-invocation-face'."
(with-ivy-window
(swiper--cleanup)
(when (> (length ivy--current) 0)
- (let* ((re (replace-regexp-in-string
- " " "\t"
- (funcall ivy--regex-function ivy-text)))
+ (let* ((re (funcall ivy--regex-function ivy-text))
(re (if (stringp re) re (caar re)))
+ (re (replace-regexp-in-string
+ " " "\t"
+ re))
(str (get-text-property 0 'swiper-line-number ivy--current))
(num (if (string-match "^[0-9]+" str)
(string-to-number (match-string 0 str))
- [elpa] master af5f097 108/348: counsel.el (counsel-locate-action-extern): Make interactive, (continued)
- [elpa] master af5f097 108/348: counsel.el (counsel-locate-action-extern): Make interactive, Oleh Krehel, 2017/04/08
- [elpa] master 0028c8c 106/348: counsel.el (counsel-outline): New command, Oleh Krehel, 2017/04/08
- [elpa] master 1d8b4f8 110/348: ivy.el (ivy-sort-matches-functions-alist): New sorting for ivy-switch-buffer, Oleh Krehel, 2017/04/08
- [elpa] master 027fbac 114/348: swiper.el (swiper-multi-action-2): Fix swiper-all, Oleh Krehel, 2017/04/08
- [elpa] master d6cf677 077/348: ivy.el (ivy-prompt): Add warning, Oleh Krehel, 2017/04/08
- [elpa] master 9bd79da 074/348: ivy.el (ivy-set-prompt): New API, Oleh Krehel, 2017/04/08
- [elpa] master 72dcca5 082/348: ivy.el (ivy-push-view): Work properly for dired-mode, Oleh Krehel, 2017/04/08
- [elpa] master 3d7e1ef 083/348: ivy.el (ivy--switch-buffer-action): Improve, Oleh Krehel, 2017/04/08
- [elpa] master 055e7b8 102/348: counsel.el (counsel-git-grep-cmd-history): Update default, Oleh Krehel, 2017/04/08
- [elpa] master 7e188d5 100/348: counsel.el (counsel-git-grep): Customize re-builder, Oleh Krehel, 2017/04/08
- [elpa] master 1da8b6c 086/348: Fix foo!bar syntax for swiper,
Oleh Krehel <=
- [elpa] master 57c0f5e 095/348: ivy.el (ivy-set-view-recur): Account for mulitple same kind splits, Oleh Krehel, 2017/04/08
- [elpa] master c84b681 109/348: ivy.el (ivy-switch-buffer): Reset index to 0 on input, Oleh Krehel, 2017/04/08
- [elpa] master 0f4acb3 115/348: Make swiper-all async, Oleh Krehel, 2017/04/08
- [elpa] master 81e14ce 111/348: counsel.el (counsel-semantic): Fix warnings, Oleh Krehel, 2017/04/08
- [elpa] master 9e87993 113/348: ivy.el (ivy-state): directory field stores default-directory, Oleh Krehel, 2017/04/08
- [elpa] master 1fa9a28 118/348: Ensure regex is a sting, Oleh Krehel, 2017/04/08
- [elpa] master 70a5360 127/348: counsel.el (counsel-git-grep-proj-function): Use greedy regex, Oleh Krehel, 2017/04/08
- [elpa] master 83f7ae6 129/348: counsel.el (counsel-yank-pop): Fix candidates not showing sometimes, Oleh Krehel, 2017/04/08
- [elpa] master 8f282a5 136/348: counsel.el (counsel-git-grep-action): Reveal text in outlines, Oleh Krehel, 2017/04/08
- [elpa] master bc96feb 141/348: ivy.el (ivy--recompute-index): Update condition, Oleh Krehel, 2017/04/08