emacs-elpa-diffs
[Top][All Lists]
Advanced

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]