diff --git a/layers/+completion/ivy/funcs.el b/layers/+completion/ivy/funcs.el index a39134054..30f21531a 100644 --- 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 index 65fb5baaf..13d6c71bb 100644 --- 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