ivy: Fix counsel search

This function was renamed upstream: abo-abo/swiper@58bf1b9
Miciah · Dec 28, 2018 · 2c28c7d · 2c28c7d
1 parent 8b3a30f
commit 2c28c7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/layers/+completion/ivy/funcs.el b/layers/+completion/ivy/funcs.el
@@ -79,7 +79,7 @@
                                (prog1 (pop split)
                                  (setq string (mapconcat #'identity split " -- "))))
                            ""))
-                   (regex (counsel-unquote-regex-parens
+                   (regex (counsel--elisp-to-pcre
                            (setq ivy--old-re
                                  (ivy--regex string)))))
               (setq spacemacs--counsel-search-cmd (format base-cmd args regex))

diff --git a/layers/+completion/ivy/packages.el b/layers/+completion/ivy/packages.el
@@ -119,6 +119,11 @@
         "stP" 'spacemacs/search-project-pt-region-or-symbol))
     :config
     (progn
+      ;; Temporarily handle older versions of ivy
+      ;; https://github.com/abo-abo/swiper/pull/1863/files
+      (unless (fboundp 'counsel--elisp-to-pcre)
+        (defalias 'counsel--elisp-to-pcre 'counsel-unquote-regex-parens))
+
       ;; set additional ivy actions
       (ivy-set-actions
        'counsel-find-file