Merge remote-tracking branch 'fork/master' into org

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

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")

modes/org/evil-collection-org.el

@@ -32,14 +32,18 @@
 (require 'evil-collection)
 (require 'org nil t)
 
-
-(defconst evil-collection-org-maps '(org-mode-map org-read-date-minibuffer-local-map))
+(defconst evil-collection-org-maps '(org-mode-map
+                                     org-read-date-minibuffer-local-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")
 
 (declare-function org-calendar-forward-day "org")
 (declare-function org-calendar-backward-day "org")
@@ -71,7 +75,12 @@
   (org-defkey org-read-date-minibuffer-local-map (kbd "M-L") #'org-calendar-forward-month)
   (org-defkey org-read-date-minibuffer-local-map (kbd "M-H") #'org-calendar-backward-month)
   (org-defkey org-read-date-minibuffer-local-map (kbd "M-J") #'org-calendar-forward-year)
-  (org-defkey org-read-date-minibuffer-local-map (kbd "M-K") #'org-calendar-backward-year))
+  (org-defkey org-read-date-minibuffer-local-map (kbd "M-K") #'org-calendar-backward-year)
+
+  (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

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 <[email protected]>
+;; Maintainer: James Nguyen <[email protected]>
+;; Pierre Neidhardt <[email protected]>
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;; 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