summaryrefslogtreecommitdiff
path: root/evil-collection-integration.el
diff options
context:
space:
mode:
authorJames Nguyen <james@jojojames.com>2017-12-28 21:07:16 -0800
committerJames N <james@jojojames.com>2018-01-09 18:53:12 -0800
commitd89cfe68e27536088da3a16c904eb76bd9bc5af6 (patch)
tree0dbe79c5bf71d8b44f73bf007e85b7c14de6f79a /evil-collection-integration.el
parente0b91b0b904ae60486da9c5f0cd734e8f9aeeb16 (diff)
Integration: Change namespace for evil-enclose-ace-jump-for-motion
Diffstat (limited to 'evil-collection-integration.el')
-rw-r--r--evil-collection-integration.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/evil-collection-integration.el b/evil-collection-integration.el
index dca6857..dbf41be 100644
--- a/evil-collection-integration.el
+++ b/evil-collection-integration.el
@@ -348,7 +348,7 @@ activated."
(defvar evil-collection-integration-ace-jump-active nil)
-(defmacro evil-enclose-ace-jump-for-motion (&rest body)
+(defmacro evil-collection-integration-enclose-ace-jump-for-motion (&rest body)
"Enclose ace-jump to make it suitable for motions.
This includes restricting `ace-jump-mode' to the current window
in visual and operator state, deactivating visual updates, saving
@@ -402,7 +402,7 @@ the mark and entering `recursive-edit'."
(evil-without-repeat
(let ((pnt (point))
(buf (current-buffer)))
- (evil-enclose-ace-jump-for-motion
+ (evil-collection-integration-enclose-ace-jump-for-motion
(call-interactively 'ace-jump-char-mode))
;; if we jump backwards, motion type is exclusive, analogously
;; to `evil-find-char-backward'
@@ -419,7 +419,7 @@ the mark and entering `recursive-edit'."
(evil-without-repeat
(let ((pnt (point))
(buf (current-buffer)))
- (evil-enclose-ace-jump-for-motion
+ (evil-collection-integration-enclose-ace-jump-for-motion
(call-interactively 'ace-jump-char-mode))
(if (and (equal buf (current-buffer))
(< (point) pnt))
@@ -436,7 +436,7 @@ the mark and entering `recursive-edit'."
:type line
:repeat abort
(evil-without-repeat
- (evil-enclose-ace-jump-for-motion
+ (evil-collection-integration-enclose-ace-jump-for-motion
(call-interactively 'ace-jump-line-mode))))
(evil-define-motion evil-ace-jump-word-mode (count)
@@ -444,7 +444,7 @@ the mark and entering `recursive-edit'."
:type exclusive
:repeat abort
(evil-without-repeat
- (evil-enclose-ace-jump-for-motion
+ (evil-collection-integration-enclose-ace-jump-for-motion
(call-interactively 'ace-jump-word-mode))))
(define-key evil-motion-state-map [remap ace-jump-char-mode] #'evil-ace-jump-char-mode)
@@ -469,7 +469,7 @@ the mark and entering `recursive-edit'."
(defmacro evil-enclose-avy-for-motion (&rest body)
"Enclose avy to make it suitable for motions.
-Based on `evil-enclose-ace-jump-for-motion'."
+Based on `evil-collection-integration-enclose-ace-jump-for-motion'."
(declare (indent defun)
(debug t))
`(let ((avy-all-windows