From bb8304c15d696d67bff8cc2be30bf940b72fc289 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 24 Mar 2018 07:24:22 -0400
Subject: [PATCH] feature/evil: rename +evil:macro-on-all-lines =>
 +evil:apply-macro

---
 modules/config/default/+bindings.el   |  4 +--
 modules/feature/evil/autoload/evil.el | 43 +++++++++++++--------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index cfd7b9f36..9b470cf54 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -321,8 +321,8 @@
       :n  "gR" #'+eval/buffer
       :v  "gR" #'+eval:replace-region
       :m  "gs" #'+default/easymotion  ; lazy-load `evil-easymotion'
-      :v  "@"  #'+evil:macro-on-all-lines
-      :n  "g@" #'+evil:macro-on-all-lines
+      :v  "@"  #'+evil:apply-macro
+      :n  "g@" #'+evil:apply-macro
       ;; repeat in visual mode (FIXME buggy)
       :v  "."  #'evil-repeat
       ;; don't leave visual mode after shifting
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index ad1d046d8..abad747f4 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -72,30 +72,27 @@ evil-window-move-* (e.g. `evil-window-move-far-left')"
 ;;;###autoload
 (defun +evil/window-move-down () "See `+evil--window-swap'"  (interactive) (+evil--window-swap 'down))
 
-;;;###autoload (autoload '+evil:macro-on-all-lines "feature/evil/autoload/evil" nil t)
-(evil-define-command +evil:macro-on-all-lines (beg end macro)
+;;;###autoload (autoload '+evil:apply-macro "feature/evil/autoload/evil" nil t)
+(evil-define-operator +evil:apply-macro (beg end)
   "Apply macro to each line."
-  :move-point t
-  :keep-visual t
-  (interactive
-   (let (macro register)
-     (setq register (or evil-this-register (read-char)))
-     (cond
-      ((or (and (eq register ?@) (eq evil-last-register ?:))
-           (eq register ?:))
-       (setq macro (lambda () (evil-ex-repeat nil))
-             evil-last-register ?:))
-      ((eq register ?@)
-       (unless evil-last-register
-         (user-error "No previously executed keyboard macro."))
-       (setq macro (evil-get-register evil-last-register t)))
-      (t
-       (setq macro (evil-get-register register t)
-             evil-last-register register)))
-     (list evil-visual-beginning evil-visual-end macro)))
-  (evil-change-state 'normal)
-  (evil-with-single-undo
-    (apply-macro-to-region-lines beg end macro)))
+  :motion nil
+  :move-point nil
+  (interactive "<r>")
+  (let ((register (or evil-this-register (read-char)))
+        macro)
+    (cond ((or (and (eq register ?@) (eq evil-last-register ?:))
+               (eq register ?:))
+           (setq macro (lambda () (evil-ex-repeat nil))
+                 evil-last-register ?:))
+          ((eq register ?@)
+           (unless evil-last-register
+             (user-error "No previously executed keyboard macro."))
+           (setq macro (evil-get-register evil-last-register t)))
+          ((setq macro (evil-get-register register t)
+                 evil-last-register register)))
+    (evil-change-state 'normal)
+    (evil-with-single-undo
+      (apply-macro-to-region-lines beg end macro))))
 
 ;;;###autoload (autoload '+evil:retab "feature/evil/autoload/evil" nil t)
 (evil-define-operator +evil:retab (&optional beg end)