[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 8eb43f8b23 13/18: Store keymap detected based o
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit 8eb43f8b23 13/18: Store keymap detected based on name in section object |
Date: |
Fri, 25 Mar 2022 13:58:20 -0400 (EDT) |
branch: elpa/git-commit
commit 8eb43f8b2373f78d5d07755e52f60fa269c2f2b7
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Store keymap detected based on name in section object
---
lisp/magit-section.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 0f682fd675..4401280d44 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -305,7 +305,7 @@ but that ship has sailed, thus this option."
(defvar magit--section-type-alist nil)
(defclass magit-section ()
- ((keymap :initform nil :allocation :class)
+ ((keymap :initform nil)
(type :initform nil :initarg :type)
(value :initform nil :initarg :value)
(start :initform nil :initarg :start)
@@ -1142,14 +1142,16 @@ anything this time around.
(magit-insert-child-count ,s)
(set-marker-insertion-type (oref ,s start) t)
(let* ((end (oset ,s end (point-marker)))
- (class-map (oref-default ,s keymap))
+ (class-map (oref ,s keymap))
(magit-map (intern (format "magit-%s-section-map"
(oref ,s type))))
(forge-map (intern (format "forge-%s-section-map"
(oref ,s type))))
- (map (or (and class-map (symbol-value class-map))
- (and (boundp magit-map) (symbol-value magit-map))
- (and (boundp forge-map) (symbol-value forge-map)))))
+ (map (and class-map (symbol-value class-map))))
+ (unless map
+ (setq map (or (and (boundp magit-map) (symbol-value magit-map))
+ (and (boundp forge-map) (symbol-value
forge-map))))
+ (oset ,s keymap map))
(save-excursion
(goto-char (oref ,s start))
(while (< (point) end)
- [nongnu] elpa/git-commit 70b34f08ab 03/18: Increase use of section type, keymap and binding inheritance, (continued)
- [nongnu] elpa/git-commit 70b34f08ab 03/18: Increase use of section type, keymap and binding inheritance, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit be371711f5 06/18: magit-section-at: New function, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 949b4a47a4 10/18: magit-mouse-toggle-section: New command, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 5641d3749c 12/18: Completely rework magit-mode-menu, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 0168be9366 14/18: Add basic context-menu, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 38cb9372dc 17/18: Add section-specific context-menus, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit f3afc117c2 18/18: Bump dependencies on Melpa, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 91ef0822d3 04/18: magit-get-section: Compare constant values, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 8c53997121 05/18: magit-section-ident-value: Split up into more methods, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 4de514b84c 07/18: magit-section-content-p: New function, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 8eb43f8b23 13/18: Store keymap detected based on name in section object,
ELPA Syncer <=
- [nongnu] elpa/git-commit bc065246b4 01/18: Remove duplicated command magit-help, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 5da6122160 08/18: magit-section-mode-map: Add docstring, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 73a2cbe61f 09/18: magit-section-heading-map: New keymap, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 7d15b1a041 11/18: magit-diff--region-range: New function, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit b7294344e3 15/18: Add context-menu utilities, ELPA Syncer, 2022/03/25
- [nongnu] elpa/git-commit 95b432530a 16/18: Do not set point when invoking context-menu, ELPA Syncer, 2022/03/25