From c0fb5a01f41a5a80634489954d327368545c53b7 Mon Sep 17 00:00:00 2001 From: Tianshu Wang Date: Fri, 11 Oct 2024 16:26:59 +0800 Subject: [PATCH 1/2] Add keybindings for org-capture --- modes/org/evil-collection-org.el | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modes/org/evil-collection-org.el b/modes/org/evil-collection-org.el index 61aec025..22db0124 100644 --- a/modes/org/evil-collection-org.el +++ b/modes/org/evil-collection-org.el @@ -31,13 +31,17 @@ ;;; Code: (require 'evil-collection) -(defconst evil-collection-org-maps '(org-mode-map)) +(defconst evil-collection-org-maps '(org-mode-map + org-capture-mode-map)) (declare-function org-shifttab "org") (declare-function org-backward-paragraph "org") (declare-function org-forward-paragraph "org") (declare-function org-backward-sentence "org") (declare-function org-forward-sentence "org") +(declare-function org-capture-finalize "org-capture") +(declare-function org-capture-kill "org-capture") +(declare-function org-capture-refile "org-capture") ;;;###autoload (defun evil-collection-org-setup () @@ -50,7 +54,12 @@ "{" 'org-backward-paragraph "}" 'org-forward-paragraph "(" 'org-backward-sentence - ")" 'org-forward-sentence)) + ")" 'org-forward-sentence) + + (evil-collection-define-key 'normal 'org-capture-mode-map + "ZZ" 'org-capture-finalize + "ZQ" 'org-capture-kill + "ZR" 'org-capture-refile)) (provide 'evil-collection-org) ;;; evil-collection-org.el ends here From d9399cb3eb03b54bbf535d5be96a15d4b51c42a4 Mon Sep 17 00:00:00 2001 From: Tianshu Wang Date: Fri, 11 Oct 2024 17:14:12 +0800 Subject: [PATCH 2/2] Add keybindings for with-editor --- evil-collection.el | 1 + modes/magit/evil-collection-magit.el | 4 +- .../evil-collection-with-editor.el | 45 +++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 modes/with-editor/evil-collection-with-editor.el diff --git a/evil-collection.el b/evil-collection.el index 44e73b50..1e67a0e7 100644 --- a/evil-collection.el +++ b/evil-collection.el @@ -337,6 +337,7 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'." wdired wgrep which-key + with-editor woman xref xwidget diff --git a/modes/magit/evil-collection-magit.el b/modes/magit/evil-collection-magit.el index 6aa75d6e..31dc829a 100644 --- a/modes/magit/evil-collection-magit.el +++ b/modes/magit/evil-collection-magit.el @@ -495,8 +495,8 @@ denotes the original magit key for this command.") ("x" git-rebase-exec "exec = run command (the rest of the line) using shell") ("d" git-rebase-kill-line "drop = remove commit" "k") ("u" git-rebase-undo "undo last change") - (nil with-editor-finish "tell Git to make it happen") - (nil with-editor-cancel "tell Git that you changed your mind, i.e. abort") + ("ZZ" with-editor-finish "tell Git to make it happen") + ("ZQ" with-editor-cancel "tell Git that you changed your mind, i.e. abort") ("k" evil-previous-line "move point to previous line" "p") ("j" evil-next-line "move point to next line" "n") ("M-k" git-rebase-move-line-up "move the commit at point up" "\M-p") diff --git a/modes/with-editor/evil-collection-with-editor.el b/modes/with-editor/evil-collection-with-editor.el new file mode 100644 index 00000000..91199a1f --- /dev/null +++ b/modes/with-editor/evil-collection-with-editor.el @@ -0,0 +1,45 @@ +;;; evil-collection-with-editor.el --- Bindings for `with-editor' -*- lexical-binding: t -*- + +;; Copyright (C) 2024 Tianshu Wang + +;; Author: Tianshu Wang +;; Maintainer: James Nguyen +;; Pierre Neidhardt +;; URL: https://github.com/emacs-evil/evil-collection +;; Version: 0.0.1 +;; Package-Requires: ((emacs "26.3")) +;; Keywords: evil, emacs, tools + +;; 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 . + +;;; Commentary: +;; Bindings for `with-editor'. + +;;; Code: +(require 'evil-collection) +(require 'with-editor nil t) + +(defvar with-editor-mode-map) + +(defconst evil-collection-with-editor-maps '(with-editor-mode-map)) + +;;;###autoload +(defun evil-collection-with-editor-setup () + "Set up `evil' bindings for `with-editor'." + (evil-collection-define-key 'normal 'with-editor-mode-map + "ZQ" 'with-editor-cancel + "ZZ" 'with-editor-finish)) + +(provide 'evil-collection-with-editor) +;;; evil-collection-with-editor.el ends here