diff options
Diffstat (limited to '.config/emacs/lisp/evil-collection/modes/vundo')
| -rw-r--r-- | .config/emacs/lisp/evil-collection/modes/vundo/README.org | 31 | ||||
| -rw-r--r-- | .config/emacs/lisp/evil-collection/modes/vundo/evil-collection-vundo.el | 93 |
2 files changed, 124 insertions, 0 deletions
diff --git a/.config/emacs/lisp/evil-collection/modes/vundo/README.org b/.config/emacs/lisp/evil-collection/modes/vundo/README.org new file mode 100644 index 0000000..04e505b --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/vundo/README.org @@ -0,0 +1,31 @@ +* vundo + + Evil bindings for [[https://github.com/casouri/vundo][vundo]], visual undo tree. + + Upstream defaults to emacs state; evil-collection forces normal state on + entry, hides the evil cursor, and disables =hl-line-mode= locally. + +** Key bindings + + | Command | Original | Evil | + |---------------------+--------------+--------------------------------| + | =vundo-forward= | =f=, =right= | =l=, =C-f=, =right= | + | =vundo-backward= | =b=, =left= | =h=, =C-b=, =left=, =DEL= | + | =vundo-next= | =n= | =j=, =C-n=, =C-j=, =M-j= | + | =vundo-previous= | =p= | =k=, =C-p=, =C-k=, =M-k= | + | =vundo-stem-root= | =a= | =H= (evil-window-top remap) | + | =vundo-stem-end= | =e= | =L= (evil-window-bottom remap) | + | =vundo-next-root= | =w= | =w= | + | =vundo-confirm= | =RET= | =RET=, =ZZ= | + | =vundo-quit= | =q=, =C-g= | =q=, =ZQ= | + | =vundo-diff= | =d= | =d= | + | =vundo-diff-mark= | =m= | =m= | + | =vundo-diff-unmark= | =u= | =u= | + | =vundo--inspect= | =i= | =i= | + | =vundo--debug= | =D= | =D= | + + Direction keys are wired via =[remap]= against the corresponding evil + motion command (=evil-backward-char=, =evil-forward-char=, etc.) so they + follow any user rebinding of those motions. =vundo-goto-last-saved= (=l= + upstream) and =vundo-goto-next-saved= (=r= upstream) are shadowed by the + evil motion remaps; call them via =M-x= if needed. diff --git a/.config/emacs/lisp/evil-collection/modes/vundo/evil-collection-vundo.el b/.config/emacs/lisp/evil-collection/modes/vundo/evil-collection-vundo.el new file mode 100644 index 0000000..e02c110 --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/vundo/evil-collection-vundo.el @@ -0,0 +1,93 @@ +;;; evil-collection-vundo.el --- Bindings for `vundo-mode' -*- lexical-binding: t -*- + +;; Copyright (C) 2022 James Nguyen + +;; Author: James Nguyen <james@jojojames.com> +;; Maintainer: James Nguyen <james@jojojames.com> +;; URL: https://github.com/emacs-evil/evil-collection +;; Version: 0.0.1 +;; Package-Requires: ((emacs "27.1")) +;; Keywords: evil, vundo, convenience + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: +;;; Bindings for `vundo-mode'. + +;;; Code: +(require 'vundo nil t) +(require 'evil-collection) + +(defgroup evil-collection-vundo nil + "Evil bindings for `vundo-mode'." + :group 'evil-collection) + +(defvar vundo-mode-map) + +(defconst evil-collection-vundo-maps '(vundo-mode-map)) + +(defun evil-collection-vundo--hide-evil-cursor () + "Hide the evil cursor." + (setq-local evil-default-cursor '(nil)) + (setq-local evil-motion-state-cursor nil) + (setq-local evil-visual-state-cursor nil) + (setq-local evil-normal-state-cursor nil) + (setq-local evil-insert-state-cursor nil) + (setq-local evil-emacs-state-cursor nil)) + +(defun evil-collection-vundo--disable-hl-line-mode () + "Disable `hl-line-mode'." + (setq-local global-hl-line-mode nil)) + +;;;###autoload +(defun evil-collection-vundo-setup () + "Set up `evil' bindings for `vundo'." + (add-hook 'vundo-mode-hook #'evil-normalize-keymaps) + ;; `vundo' defaults to emacs state. + (add-hook 'vundo-mode-hook #'evil-normal-state) + ;; hide evil cursor + (add-hook 'vundo-mode-hook #'evil-collection-vundo--hide-evil-cursor) + ;; disable hl-line-mode + (add-hook 'vundo-mode-hook #'evil-collection-vundo--disable-hl-line-mode) + + (evil-collection-define-key 'normal 'vundo-mode-map + [remap evil-backward-char] 'vundo-backward + [remap evil-forward-char] 'vundo-forward + [remap evil-next-line] 'vundo-next + [remap evil-previous-line] 'vundo-previous + [remap evil-window-top] 'vundo-stem-root + [remap evil-window-bottom] 'vundo-stem-end + [remap evil-ret] 'vundo-confirm + [remap evil-quit] 'vundo-quit + [remap evil-save-and-close] 'vundo-confirm + [remap evil-save-modified-and-close] 'vundo-confirm + [remap evil-delete-backward-char] 'vundo-backward + (kbd "C-n") 'vundo-next + (kbd "C-p") 'vundo-previous + (kbd "C-j") 'vundo-next + (kbd "C-k") 'vundo-previous + (kbd "M-j") 'vundo-next + (kbd "M-k") 'vundo-previous + "i" 'vundo--inspect + "D" 'vundo--debug + "d" 'vundo-diff + "m" 'vundo-diff-mark + "u" 'vundo-diff-unmark + "w" 'vundo-next-root + "q" 'vundo-quit + "ZZ" 'vundo-quit + "ZQ" 'vundo-quit)) + +(provide 'evil-collection-vundo) +;;; evil-collection-vundo.el ends here |