   :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)


(defmacro evil-enclose-avy-for-motion (&rest body)
  "Enclose avy to make it suitable for motions.
Based on `evil-enclose-ace-jump-for-motion'."
  (declare (indent defun)
           (debug t))
  `(let ((avy-all-windows


(defvar evil-collection-integration-ace-jump-active nil)

(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
