branch: master
commit 1fa9a281d4efd1da0048d7d76182fc79044452ac
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
Ensure regex is a sting
* ivy.el (ivy-sort-function-buffer): Update.
* swiper.el (swiper-all-function): Update.
Fixes #608
---
ivy.el | 1 +
swiper.el | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ivy.el b/ivy.el
index 36b4b94..aa433d4 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2392,6 +2392,7 @@ Prefer first \"^*NAME\", then \"^NAME\"."
(if (or (string-match "^\\^" name) (string= name ""))
candidates
(let* ((base-re (funcall ivy--regex-function name))
+ (base-re (if (consp base-re) (caar base-re) base-re))
(re-prefix (concat "^\\*" base-re))
res-prefix
res-noprefix)
diff --git a/swiper.el b/swiper.el
index 76e182f..84af6f5 100644
--- a/swiper.el
+++ b/swiper.el
@@ -709,15 +709,16 @@ Run `swiper' for those buffers."
(defun swiper-all-function (str)
(if (and (< (length str) 3))
(list "" (format "%d chars more" (- 3 (length ivy-text))))
- (let ((buffers (cl-remove-if-not
- (lambda (b)
- (or (buffer-file-name b)
- (eq (with-current-buffer b
- major-mode) 'dired-mode)))
- (buffer-list)))
- (re (funcall ivy--regex-function str))
- cands
- match)
+ (let* ((buffers (cl-remove-if-not
+ (lambda (b)
+ (or (buffer-file-name b)
+ (eq (with-current-buffer b
+ major-mode) 'dired-mode)))
+ (buffer-list)))
+ (re (funcall ivy--regex-function str))
+ (re (if (consp re) (caar re) re))
+ cands
+ match)
(dolist (buffer buffers)
(with-current-buffer buffer
(save-excursion
@@ -728,8 +729,8 @@ Run `swiper' for those buffers."
(line-beginning-position)
(line-end-position))
(buffer-substring
- (line-beginning-position)
- (line-end-position))))
+ (line-beginning-position)
+ (line-end-position))))
(put-text-property
0 1 'buffer
(buffer-name)
