]> code.delx.au - gnu-emacs-elpa/commitdiff
ivy.el (ivy-next-history-element): No "\\_<" for dynamic-collection
authorOleh Krehel <ohwoeowho@gmail.com>
Tue, 1 Mar 2016 18:30:38 +0000 (19:30 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Tue, 1 Mar 2016 18:30:38 +0000 (19:30 +0100)
"\\_<" regex is Emacs-specific and should only be done if
:dynamic-collection is nil.
It is nil for `counsel-git-grep' with repositories < 20000 lines, but
non-nil for larger ones.

Fixes #409

ivy.el

diff --git a/ivy.el b/ivy.el
index 5c89d7f507d71f4871d6530135977ddc9c28b2ca..a09f657ec1c4cfb3915e3e1bafd7a824c87625ad 100644 (file)
--- a/ivy.el
+++ b/ivy.el
@@ -895,6 +895,7 @@ Call the permanent action if possible."
         (insert ivy--default)
         (when (and (with-ivy-window (derived-mode-p 'prog-mode))
                    (not (file-exists-p ivy--default))
+                   (not (ivy-state-dynamic-collection ivy-last))
                    (> (point) (minibuffer-prompt-end)))
           (undo-boundary)
           (insert "\\_>")