diff options
| author | James Nguyen <james@jojojames.com> | 2017-12-28 21:09:14 -0800 |
|---|---|---|
| committer | James N <james@jojojames.com> | 2018-01-09 18:53:12 -0800 |
| commit | 6a5f4aa1d54742df1433026f52f4ab954978272a (patch) | |
| tree | a4948e28557ef897d90cd7bb0205bc179e7f6d8e /evil-collection-integration.el | |
| parent | d89cfe68e27536088da3a16c904eb76bd9bc5af6 (diff) | |
Integration: Change namespace for evil-ace-jump-exit-recursive-edit
Diffstat (limited to 'evil-collection-integration.el')
| -rw-r--r-- | evil-collection-integration.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/evil-collection-integration.el b/evil-collection-integration.el index dbf41be..20c3aef 100644 --- a/evil-collection-integration.el +++ b/evil-collection-integration.el @@ -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) |