diff --git a/thoom-emacs/ThoomEmacs.org b/thoom-emacs/ThoomEmacs.org index f53e080..e06001f 100644 --- a/thoom-emacs/ThoomEmacs.org +++ b/thoom-emacs/ThoomEmacs.org @@ -207,11 +207,11 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by :init ;; TODO - make this unnecessary (require 'meow) - (defun meow-wrap-negative (command) - (lambda () - (interactive) - (let ((current-prefix-arg -1)) - (call-interactively command)))) + (defmacro thoom/meow-negate (meow-command) + `(lambda () + (interactive) + (let ((current-prefix-arg -1)) + (call-interactively ,meow-command)))) ;; TODO - debug this. should make org headings into meow things (meow-thing-register 'heading 'heading 'heading) @@ -296,7 +296,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by '("e" . meow-next-word) '("E" . meow-next-symbol) '("f" . meow-find) - `("F" . ,(meow-wrap-negative 'meow-find)) + `("F" . ,(thoom/meow-negate 'meow-find)) '("g" . meow-cancel-selection) '("G" . meow-grab) '("h" . meow-left) @@ -324,15 +324,15 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by '("s" . meow-kill) ;; Potential addition - S '("t" . meow-till) - `("T" . ,(meow-wrap-negative 'meow-till)) + `("T" . ,(thoom/meow-negate 'meow-till)) '("u" . meow-undo) '("U" . meow-undo-in-selection) '("v" . meow-visit) - `("V" . ,(meow-wrap-negative 'meow-visit)) + `("V" . ,(thoom/meow-negate 'meow-visit)) '("w" . meow-mark-word) '("W" . meow-mark-symbol) '("x" . meow-line) - `("X" . ,(meow-wrap-negative 'meow-line)) + `("X" . ,(thoom/meow-negate 'meow-line)) '("y" . meow-save) '("Y" . meow-sync-grab) '("z" . meow-pop-selection) diff --git a/thoom-emacs/init.el b/thoom-emacs/init.el index 54d9adb..1740ce4 100644 --- a/thoom-emacs/init.el +++ b/thoom-emacs/init.el @@ -144,11 +144,11 @@ :init ;; TODO - make this unnecessary (require 'meow) - (defun meow-wrap-negative (command) - (lambda () - (interactive) - (let ((current-prefix-arg -1)) - (call-interactively command)))) + (defmacro thoom/meow-negate (meow-command) + `(lambda () + (interactive) + (let ((current-prefix-arg -1)) + (call-interactively ,meow-command)))) ;; TODO - debug this. should make org headings into meow things (meow-thing-register 'heading 'heading 'heading) @@ -233,7 +233,7 @@ '("e" . meow-next-word) '("E" . meow-next-symbol) '("f" . meow-find) - `("F" . ,(meow-wrap-negative 'meow-find)) + `("F" . ,(thoom/meow-negate 'meow-find)) '("g" . meow-cancel-selection) '("G" . meow-grab) '("h" . meow-left) @@ -261,15 +261,15 @@ '("s" . meow-kill) ;; Potential addition - S '("t" . meow-till) - `("T" . ,(meow-wrap-negative 'meow-till)) + `("T" . ,(thoom/meow-negate 'meow-till)) '("u" . meow-undo) '("U" . meow-undo-in-selection) '("v" . meow-visit) - `("V" . ,(meow-wrap-negative 'meow-visit)) + `("V" . ,(thoom/meow-negate 'meow-visit)) '("w" . meow-mark-word) '("W" . meow-mark-symbol) '("x" . meow-line) - `("X" . ,(meow-wrap-negative 'meow-line)) + `("X" . ,(thoom/meow-negate 'meow-line)) '("y" . meow-save) '("Y" . meow-sync-grab) '("z" . meow-pop-selection)