From ff2f30f9b49c0266ae830a8f455fab47d2efc1c4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 18 Mar 2018 21:54:03 -0400 Subject: [PATCH] feature/evil: improve bf771dcb --- modules/completion/ivy/autoload/ivy.el | 2 -- modules/feature/evil/config.el | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index 6bfa405f9..d7dd1ed1b 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -164,8 +164,6 @@ NOTE This may need to be updated frequently, to meet changes upstream (in counsel-rg)." (if (< (length string) 1) ; <-- modified the character limit (counsel-more-chars 1) ; <-- - (when (and (featurep 'evil) evil-mode) - (evil-set-jump)) (let ((default-directory (ivy-state-directory ivy-last)) (regex (counsel-unquote-regex-parens (setq ivy--old-re diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 3fc4f0550..bede221ff 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -152,7 +152,12 @@ (evil-set-command-properties '+evil:align :move-point t :ex-arg 'buffer-match :ex-bang t :evil-mc t :keep-visual t :suppress-operator t) (evil-set-command-properties - '+evil:mc :move-point nil :ex-arg 'global-match :ex-bang t :evil-mc t)) + '+evil:mc :move-point nil :ex-arg 'global-match :ex-bang t :evil-mc t) + + ;; Ensure jump points are created + (defun +evil*set-jump (&rest _) + (evil-set-jump)) + (advice-add #'counsel-git-grep-action :before #'+evil*set-jump)) ;;