emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Integration: Change namespace for evil-ace-jump-exit-recursive-edit

This commit is contained in:
James Nguyen 2017-12-28 21:09:14 -08:00 committed by James N
parent d89cfe68e2
commit 6a5f4aa1d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evil-collection-integration.el
View File

@ -366,15 +366,15 @@ the mark and entering `recursive-edit'."
(unwind-protect
(let ((evil-collection-integration-ace-jump-active 'prepare))
(add-hook 'ace-jump-mode-end-hook
#'evil-ace-jump-exit-recursive-edit)
#'evil-collection-integration-ace-jump-exit-recursive-edit)
,@body
(when evil-collection-integration-ace-jump-active
(setq evil-collection-integration-ace-jump-active t)
(recursive-edit)))
(remove-hook 'post-command-hook
#'evil-ace-jump-exit-recursive-edit)
#'evil-collection-integration-ace-jump-exit-recursive-edit)
(remove-hook 'ace-jump-mode-end-hook
#'evil-ace-jump-exit-recursive-edit)
#'evil-collection-integration-ace-jump-exit-recursive-edit)
(if (evil-visual-state-p)
(progn
(add-hook 'pre-command-hook #'evil-visual-pre-command nil t)
@ -385,15 +385,15 @@ the mark and entering `recursive-edit'."
(eval-after-load 'ace-jump-mode
`(defadvice ace-jump-done (after evil activate)
(when evil-collection-integration-ace-jump-active
(add-hook 'post-command-hook #'evil-ace-jump-exit-recursive-edit))))
(add-hook 'post-command-hook #'evil-collection-integration-ace-jump-exit-recursive-edit))))
(defun evil-ace-jump-exit-recursive-edit ()
(defun evil-collection-integration-ace-jump-exit-recursive-edit ()
"Exit a recursive edit caused by an evil jump."
(cond
((eq evil-collection-integration-ace-jump-active 'prepare)
(setq evil-collection-integration-ace-jump-active nil))
(evil-collection-integration-ace-jump-active
(remove-hook 'post-command-hook #'evil-ace-jump-exit-recursive-edit)
(remove-hook 'post-command-hook #'evil-collection-integration-ace-jump-exit-recursive-edit)
(exit-recursive-edit))))
(evil-define-motion evil-ace-jump-char-mode (count)