emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Integrate evil-easymotion into evil-snipe

Browse source
This commit is contained in:
Henrik Lissner 2016-04-10 18:48:05 -04:00
parent 78e2680290
commit 81dd407583
2 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

45
core/core-evil.el
View file

@ -315,23 +315,6 @@
(define-key evil-inner-text-objects-map "%" #'evilmi-text-object) (define-key evil-inner-text-objects-map "%" #'evilmi-text-object)
(define-key evil-outer-text-objects-map "%" #'evilmi-text-object)) (define-key evil-outer-text-objects-map "%" #'evilmi-text-object))
(use-package evil-easymotion
:defer 1
:config
(evilem-default-keybindings "g SPC")
(evilem-define (kbd "g SPC n") 'evil-ex-search-next)
(evilem-define (kbd "g SPC N") 'evil-ex-search-previous)
(evilem-define "gs" '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)))
(evilem-define "gS" '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))))
(use-package evil-numbers (use-package evil-numbers
:commands (evil-numbers/inc-at-pt evil-numbers/dec-at-pt)) :commands (evil-numbers/inc-at-pt evil-numbers/dec-at-pt))
@ -346,6 +329,30 @@
(global-evil-search-highlight-persist t) (global-evil-search-highlight-persist t)
(advice-add 'evil-force-normal-state :after 'evil-search-highlight-persist-remove-all)) (advice-add 'evil-force-normal-state :after 'evil-search-highlight-persist-remove-all))
(use-package evil-easymotion
:defer 1
:init (defvar narf--evil-snipe-repeat-fn)
:config
(evilem-default-keybindings "g SPC")
(evilem-define (kbd "g SPC n") 'evil-ex-search-next)
(evilem-define (kbd "g SPC N") 'evil-ex-search-previous)
(evilem-define "gs" '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)))
(evilem-define "gS" '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)))
(setq narf--evil-snipe-repeat-fn
(evilem-create 'evil-snipe-repeat
:bind ((evil-snipe-scope 'whole-buffer)
(evil-snipe-enable-highlight)
(evil-snipe-enable-incremental-highlight)))))
(use-package evil-snipe (use-package evil-snipe
:init :init
(setq-default (setq-default
@ -359,7 +366,9 @@
(?\; "[;:]"))) (?\; "[;:]")))
:config :config
(evil-snipe-mode 1) (evil-snipe-mode 1)
(evil-snipe-override-mode 1)) (evil-snipe-override-mode 1)
(define-key evil-snipe-parent-transient-map (kbd "C-;") 'narf/evil-snipe-easymotion))
(use-package evil-surround (use-package evil-surround
:commands (global-evil-surround-mode :commands (global-evil-surround-mode

6
core/defuns/defuns-evil.el
View file

@ -163,5 +163,11 @@
(evil-define-command narf:omap (bang input &optional mode) (evil-define-command narf:omap (bang input &optional mode)
(interactive "<!><a>") (narf:map bang input 'operator)) (interactive "<!><a>") (narf:map bang input 'operator))
;;;###autoload
(defun narf/evil-snipe-easymotion ()
(interactive)
(require 'evil-easymotion)
(call-interactively narf--evil-snipe-repeat-fn))
(provide 'defuns-evil) (provide 'defuns-evil)
;;; defuns-evil.el ends here ;;; defuns-evil.el ends here