[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit f620d6899f 5/6: Use abort-recursive-edit if abo
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit f620d6899f 5/6: Use abort-recursive-edit if abort-minibuffers is not available yet |
Date: |
Sat, 22 Jul 2023 22:01:16 -0400 (EDT) |
branch: elpa/git-commit
commit f620d6899ffec796bc297a3df3cabdc0d781b57e
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Use abort-recursive-edit if abort-minibuffers is not available yet
It wasn't added until Emacs 28.1.
---
lisp/magit-process.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 17c4607bd1..e8d41e326b 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -779,10 +779,13 @@ PARENT is used as the parent of the returned keymap."
(let ((cmd (lambda ()
(interactive)
(ignore-errors (kill-process process))
- (abort-minibuffers))))
+ (if (fboundp 'abort-minibuffers)
+ (abort-minibuffers)
+ (abort-recursive-edit)))))
(define-keymap :parent parent
"C-g" cmd
- "<remap> <abort-minibuffers>" cmd)))
+ "<remap> <abort-minibuffers>" cmd
+ "<remap> <abort-recursive-edit>" cmd)))
(defmacro magit-process-kill-on-abort (process &rest body)
(declare (indent 1)
- [nongnu] elpa/git-commit updated (2126eab6a9 -> eba1e855f3), ELPA Syncer, 2023/07/22
- [nongnu] elpa/git-commit 38138c14e8 1/6: Don't try to load magit-libgit when magit-inhibit-libgit is set, ELPA Syncer, 2023/07/22
- [nongnu] elpa/git-commit 1127aa8b3d 2/6: magit-process-username-prompt: Cosmetics, ELPA Syncer, 2023/07/22
- [nongnu] elpa/git-commit 4efdc7066f 3/6: magit-process-yes-or-no-prompt: Cosmetics, ELPA Syncer, 2023/07/22
- [nongnu] elpa/git-commit f620d6899f 5/6: Use abort-recursive-edit if abort-minibuffers is not available yet,
ELPA Syncer <=
- [nongnu] elpa/git-commit eba1e855f3 6/6: Silence byte-compiler on Emacs 26.3 and older, ELPA Syncer, 2023/07/22
- [nongnu] elpa/git-commit 8b3acf7473 4/6: Fix killing process if user input is aborted, ELPA Syncer, 2023/07/22