Merge pull request #28 from noctuid/avy-all-windows

Add support for avy-all-windows

Author: PythonNut

evil-easymotion.el

@@ -103,50 +103,51 @@
   "avy-jump to the set of points generated by collector"
   (require 'avy)
   (let* ((avy-style (or evilem-style avy-style))
-         (avy-keys (or evilem-keys avy-keys))
-         (avy-all-windows nil))
-    (avy--process (mapcar
-                   (lambda (pt)
-                     (cons pt  (get-buffer-window)))
-                   points)
+         (avy-keys (or evilem-keys avy-keys)))
+    (avy--process points
                   (avy--style-fn avy-style))))
 
-(defun evilem--collect (func &optional scope)
+(defun evilem--collect (func &optional scope all-windows)
   "Repeatedly execute func, and collect the cursor positions into a list"
   (if (functionp func)
       (let ((points)
+            (point)
+            (avy-all-windows all-windows)
             ;; make sure the motion doesn't move the window
             (scroll-conservatively 101)
             (smooth-scroll-margin 0)
             (scroll-margin 0))
-        (save-excursion
-          (save-restriction
-            (cl-destructuring-bind (beg . end)
-                (if scope
-                    (bounds-of-thing-at-point scope)
-                  (cons (point-min)
-                        (point-max)))
-
-              ;; trim trailing newline
-              (when (= (char-before end) 10)
-                (cl-decf end))
-
-              (narrow-to-region (max beg (window-start))
-                                (min end (window-end))))
-            (while (and (ignore-errors
-                          (setq this-command func
-                                last-command func)
-                          (call-interactively func)
-                          t)
-                        (not (memq (point) points))
-                        (push (point) points))))
-          (nreverse points)))
+        (avy-dowindows current-prefix-arg
+          (save-excursion
+            (save-restriction
+              (cl-destructuring-bind (beg . end)
+                  (if scope
+                      (bounds-of-thing-at-point scope)
+                    (cons (point-min)
+                          (point-max)))
+
+                ;; trim trailing newline
+                (when (= (char-before end) 10)
+                  (cl-decf end))
+
+                (narrow-to-region (max beg (window-start))
+                                  (min end (window-end))))
+              (while (and (ignore-errors
+                            (setq this-command func
+                                  last-command func)
+                            (call-interactively func)
+                            t)
+                          (setq point (cons (point) (get-buffer-window)))
+                          (not (member point points))
+                          (push point points))))))
+        (nreverse points))
     (cl-remove-duplicates
      (cl-mapcan (lambda (f)
-                  (evilem--collect f scope))
+                  (evilem--collect f scope all-windows))
                 func))))
 
-(cl-defmacro evilem-make-motion (name func &key pre-hook post-hook bind scope)
+(cl-defmacro evilem-make-motion (name func &key pre-hook post-hook bind scope
+                                      all-windows)
   "Automatically define an evil easymotion for `func', naming it `name'"
   `(evil-define-motion ,name (_count)
      (evil-without-repeat
@@ -155,50 +156,57 @@
          ,(when pre-hook `(funcall ,(if (functionp pre-hook)
                                         pre-hook
                                         `(lambda () ,pre-hook))))
-         (evilem--jump (evilem--collect ,func ,scope))
+         (evilem--jump (evilem--collect ,func ,scope ,all-windows))
          ,(when post-hook `(funcall ,(if (functionp post-hook)
                                          post-hook
                                          `(lambda () ,post-hook))))))))
 
-(cl-defmacro evilem-make-motion-plain (name func &key pre-hook post-hook bind scope)
+(cl-defmacro evilem-make-motion-plain (name func &key pre-hook post-hook bind scope
+                                            all-windows)
   "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 ,func ,scope))
+       (evilem--jump (evilem--collect ,func ,scope ,all-windows))
        ,(when post-hook `(funcall ,(if (functionp post-hook)
                                        post-hook
                                        `(lambda () ,post-hook)))))))
 
-(cl-defmacro evilem-create (motion &key pre-hook post-hook bind scope)
+(cl-defmacro evilem-create (motion &key pre-hook post-hook bind scope
+                                   all-windows)
   `(evilem-make-motion
     ,(intern (evilem--make-name motion))
     ,motion
     :pre-hook ,pre-hook
     :post-hook ,post-hook
     :bind ,bind
-    :scope ,scope))
+    :scope ,scope
+    :all-windows ,all-windows))
 
-(cl-defmacro evilem-create-plain (motion &key pre-hook post-hook bind scope)
+(cl-defmacro evilem-create-plain (motion &key pre-hook post-hook bind scope
+                                         all-windows)
   `(evilem-make-motion-plain
     ,(intern (evilem--make-name motion))
     ,motion
     :pre-hook ,pre-hook
     :post-hook ,post-hook
     :bind ,bind
-    :scope ,scope))
+    :scope ,scope
+    :all-windows ,all-windows))
 
-(cl-defmacro evilem-define (key motion &key pre-hook post-hook bind scope)
+(cl-defmacro evilem-define (key motion &key pre-hook post-hook bind scope
+                                all-windows)
   "Automatically create and bind an evil motion"
   `(define-key evil-motion-state-map ,key
      (evilem-create ,motion
                     :pre-hook ,pre-hook
                     :post-hook ,post-hook
                     :bind ,bind
-                    :scope ,scope)))
+                    :scope ,scope
+                    :all-windows ,all-windows)))
 
 ;;;###autoload
 (defun evilem-default-keybindings (prefix)