completion/ivy: use region is active & fix regex quoting

Fixes #1930
2019-10-22 11:27:07 -04:00 · 2019-10-22 11:27:07 -04:00 · f79d191701
commit f79d191701
parent 6e6672b135
2 changed files with 12 additions and 6 deletions
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@ -366,14 +366,14 @@ order.
                    (let ((query (buffer-substring-no-properties beg end)))
                      ;; Escape characters that are special to ivy searches
                      (replace-regexp-in-string "[! |]" (lambda (substr)
-                                                          (cond ((and (featurep! +fuzzy)
-                                                                      (string= substr " "))
+                                                          (cond ((and (string= substr " ")
+                                                                      (not (featurep! +fuzzy)))
                                                                 "  ")
                                                                ((and (string= substr "|")
                                                                      (eq engine 'rg))
                                                                 "\\\\\\\\|")
                                                                ((concat "\\\\" substr))))
-                                                (regexp-quote query))))))))
+                                                (rxt-quote-pcre query))))))))
         (prompt
          (format "%s%%s %s"
                  (symbol-name engine)