Use avy-with in motion definitions, closes #37

PythonNut · Oct 18, 2016 · 72129a6 · 72129a6
1 parent eb1433a
commit 72129a6
Showing 1 changed file with 28 additions and 26 deletions.
diff --git a/evil-easymotion.el b/evil-easymotion.el
@@ -179,20 +179,21 @@
          'evil-define-command
        'evil-define-motion)
     ,name (&optional _count)
-    (evil-without-repeat
-      (setq evil-this-type 'inclusive)
-      (cl-letf* ,bind
-        ,(when pre-hook `(funcall ,(if (functionp pre-hook)
-                                       pre-hook
-                                     `(lambda () ,pre-hook))))
-        (evilem--jump (evilem--collect ,funcs
-                                       ,scope
-                                       ,all-windows
-                                       ,initial-point
-                                       ,collect-postprocess))
-        ,(when post-hook `(funcall ,(if (functionp post-hook)
-                                        post-hook
-                                      `(lambda () ,post-hook))))))))
+    (avy-with ,name
+      (evil-without-repeat
+        (setq evil-this-type 'inclusive)
+        (cl-letf* ,bind
+          ,(when pre-hook `(funcall ,(if (functionp pre-hook)
+                                         pre-hook
+                                       `(lambda () ,pre-hook))))
+          (evilem--jump (evilem--collect ,funcs
+                                         ,scope
+                                         ,all-windows
+                                         ,initial-point
+                                         ,collect-postprocess))
+          ,(when post-hook `(funcall ,(if (functionp post-hook)
+                                          post-hook
+                                        `(lambda () ,post-hook)))))))))
 
 (cl-defmacro evilem-make-motion-plain (name
                                        funcs
@@ -207,18 +208,19 @@
   "Automatically define a plain easymotion for `func', naming it `name'"
   `(defun ,name ()
      (interactive)
-     (cl-letf* ,bind
-       ,(when pre-hook `(funcall ,(if (functionp pre-hook)
-                                      pre-hook
-                                    `(lambda () ,pre-hook))))
-       (evilem--jump (evilem--collect ,funcs
-                                      ,scope
-                                      ,all-windows
-                                      ,initial-point
-                                      ,collect-postprocess))
-       ,(when post-hook `(funcall ,(if (functionp post-hook)
-                                       post-hook
-                                       `(lambda () ,post-hook)))))))
+     (avy-with ,name
+       (cl-letf* ,bind
+         ,(when pre-hook `(funcall ,(if (functionp pre-hook)
+                                        pre-hook
+                                      `(lambda () ,pre-hook))))
+         (evilem--jump (evilem--collect ,funcs
+                                        ,scope
+                                        ,all-windows
+                                        ,initial-point
+                                        ,collect-postprocess))
+         ,(when post-hook `(funcall ,(if (functionp post-hook)
+                                         post-hook
+                                       `(lambda () ,post-hook))))))))
 
 (cl-defmacro evilem-create (motions
                             &key