emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feature/evil: rename +evil:macro-on-all-lines => +evil:apply-macro

Browse source
This commit is contained in:
Henrik Lissner 2018-03-24 07:24:22 -04:00
parent f822fffdd2
commit bb8304c15d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/config/default/+bindings.el
View file

@ -321,8 +321,8 @@
:n "gR" #'+eval/buffer :n "gR" #'+eval/buffer
:v "gR" #'+eval:replace-region :v "gR" #'+eval:replace-region
:m "gs" #'+default/easymotion ; lazy-load `evil-easymotion' :m "gs" #'+default/easymotion ; lazy-load `evil-easymotion'
:v "@" #'+evil:macro-on-all-lines :v "@" #'+evil:apply-macro
:n "g@" #'+evil:macro-on-all-lines :n "g@" #'+evil:apply-macro
;; repeat in visual mode (FIXME buggy) ;; repeat in visual mode (FIXME buggy)
:v "." #'evil-repeat :v "." #'evil-repeat
;; don't leave visual mode after shifting ;; don't leave visual mode after shifting

43
modules/feature/evil/autoload/evil.el
View file

@ -72,30 +72,27 @@ evil-window-move-* (e.g. `evil-window-move-far-left')"
;;;###autoload ;;;###autoload
(defun +evil/window-move-down () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'down)) (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) ;;;###autoload (autoload '+evil:apply-macro "feature/evil/autoload/evil" nil t)
(evil-define-command +evil:macro-on-all-lines (beg end macro) (evil-define-operator +evil:apply-macro (beg end)
"Apply macro to each line." "Apply macro to each line."
:move-point t :motion nil
:keep-visual t :move-point nil
(interactive (interactive "<r>")
(let (macro register) (let ((register (or evil-this-register (read-char)))
(setq register (or evil-this-register (read-char))) macro)
(cond (cond ((or (and (eq register ?@) (eq evil-last-register ?:))
((or (and (eq register ?@) (eq evil-last-register ?:)) (eq register ?:))
(eq register ?:)) (setq macro (lambda () (evil-ex-repeat nil))
(setq macro (lambda () (evil-ex-repeat nil)) evil-last-register ?:))
evil-last-register ?:)) ((eq register ?@)
((eq register ?@) (unless evil-last-register
(unless evil-last-register (user-error "No previously executed keyboard macro."))
(user-error "No previously executed keyboard macro.")) (setq macro (evil-get-register evil-last-register t)))
(setq macro (evil-get-register evil-last-register t))) ((setq macro (evil-get-register register t)
(t evil-last-register register)))
(setq macro (evil-get-register register t) (evil-change-state 'normal)
evil-last-register register))) (evil-with-single-undo
(list evil-visual-beginning evil-visual-end macro))) (apply-macro-to-region-lines beg end macro))))
(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) ;;;###autoload (autoload '+evil:retab "feature/evil/autoload/evil" nil t)
(evil-define-operator +evil:retab (&optional beg end) (evil-define-operator +evil:retab (&optional beg end)