From 93917fd8a2ba66852a3f953bbec27fc1aecd529d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 10 Jul 2018 14:21:02 +0200 Subject: [PATCH] Fix gsn/gsN & gs*/gs# evil-easymotion binds --- modules/config/default/+bindings.el | 2 -- modules/feature/evil/config.el | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el index 4ce3fb274..ae8eb983a 100644 --- a/modules/config/default/+bindings.el +++ b/modules/config/default/+bindings.el @@ -169,8 +169,6 @@ :map evilem-map "a" (evilem-create #'evil-forward-arg) "A" (evilem-create #'evil-backward-arg) - "n" (evilem-create #'evil-ex-search-next) - "N" (evilem-create #'evil-ex-search-previous) "s" (evilem-create #'evil-snipe-repeat :pre-hook (save-excursion (call-interactively #'evil-snipe-s)) :bind ((evil-snipe-scope 'buffer) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 5540bad77..e1892d7a8 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -157,7 +157,18 @@ (def-package! evil-easymotion - :commands (evilem-create evilem-default-keybindings)) + :commands (evilem-create evilem-default-keybindings) + :config + ;; Use evil-search backend, instead of isearch + (evilem-make-motion evilem-motion-search-next #'evil-ex-search-next + :bind ((evil-ex-search-highlight-all nil))) + (evilem-make-motion evilem-motion-search-previous #'evil-ex-search-previous + :bind ((evil-ex-search-highlight-all nil))) + + (evilem-make-motion evilem-motion-search-word-forward #'evil-ex-search-word-forward + :bind ((evil-ex-search-highlight-all nil))) + (evilem-make-motion evilem-motion-search-word-backward #'evil-ex-search-word-backward + :bind ((evil-ex-search-highlight-all nil)))) (def-package! evil-embrace