From 0156c67ad00510fc06bbc20c8ba097dff25b015d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 20 Mar 2018 15:56:37 -0400 Subject: [PATCH] config/default: autoload +default/easymotion --- modules/config/default/+bindings.el | 1 + modules/config/default/autoload/evil.el | 21 +++++++++++++++++++++ modules/config/default/config.el | 24 +----------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el index 552a97514..2bf50f2cb 100644 --- a/modules/config/default/+bindings.el +++ b/modules/config/default/+bindings.el @@ -319,6 +319,7 @@ :n "gr" #'+eval:region :n "gR" #'+eval/buffer :v "gR" #'+eval:replace-region + :m "gs" #'+default/easymotion ; lazy-load `evil-easymotion' :v "@" #'+evil:macro-on-all-lines :n "g@" #'+evil:macro-on-all-lines ;; repeat in visual mode (FIXME buggy) diff --git a/modules/config/default/autoload/evil.el b/modules/config/default/autoload/evil.el index d16d70480..33aecd814 100644 --- a/modules/config/default/autoload/evil.el +++ b/modules/config/default/autoload/evil.el @@ -36,3 +36,24 @@ buffers." (interactive "") (doom/kill-matching-buffers pattern bang)) +;;;###autoload +(defun +default/easymotion () + "TODO" + (interactive) + (let ((prefix (this-command-keys))) + (evilem-default-keybindings prefix) + (map! :map evilem-map + "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) + (evil-snipe-enable-highlight) + (evil-snipe-enable-incremental-highlight))) + "S" (evilem-create #'evil-snipe-repeat-reverse + :pre-hook (save-excursion (call-interactively #'evil-snipe-s)) + :bind ((evil-snipe-scope 'buffer) + (evil-snipe-enable-highlight) + (evil-snipe-enable-incremental-highlight)))) + (set-transient-map evilem-map) + (which-key-reload-key-sequence prefix))) diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 98ab3476d..29b88df37 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -109,26 +109,4 @@ (do-repeat! evil-visualstar/begin-search-forward evil-ex-search-next evil-ex-search-previous) (do-repeat! evil-visualstar/begin-search-backward - evil-ex-search-previous evil-ex-search-next)) - - ;; lazy-load `evil-easymotion' - (map! :m "gs" #'+default/easymotion) - (defun +default/easymotion () - (interactive) - (let ((prefix (this-command-keys))) - (evilem-default-keybindings prefix) - (map! :map evilem-map - "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) - (evil-snipe-enable-highlight) - (evil-snipe-enable-incremental-highlight))) - "S" (evilem-create #'evil-snipe-repeat-reverse - :pre-hook (save-excursion (call-interactively #'evil-snipe-s)) - :bind ((evil-snipe-scope 'buffer) - (evil-snipe-enable-highlight) - (evil-snipe-enable-incremental-highlight)))) - (set-transient-map evilem-map) - (which-key-reload-key-sequence prefix))))) + evil-ex-search-previous evil-ex-search-next))))