[nongnu] elpa/git-commit 5ddf251823 3/5: git-rebase-mode-show-keybindings: Propertize all keys

[ELPA Syncer]

branch: elpa/git-commit
commit 5ddf251823227cbe64ddf406201d5fb1a7c3fc02
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    git-rebase-mode-show-keybindings: Propertize all keys
    
    Do not propertize their padding.
---
 lisp/git-rebase.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index 941c7962e6..345fab239e 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -783,9 +783,10 @@ By default, this is the same except for the \"pick\" 
command."
                   nil t))
         (goto-char (line-beginning-position))
         (pcase-dolist (`(,cmd . ,desc) git-rebase-command-descriptions)
-          (insert (format "%s %-8s %s\n"
+          (insert (format "%s %s %s\n"
                           comment-start
-                          (substitute-command-keys (format "\\[%s]" cmd))
+                          (string-pad
+                           (substitute-command-keys (format "\\[%s]" cmd)) 8)
                           desc)))
         (while (re-search-forward (concat git-rebase-comment-re
                                           "\\(  ?\\)\\([^\n,],\\) "
@@ -797,13 +798,16 @@ By default, this is the same except for the \"pick\" 
command."
                                (1+ (line-end-position)))
               (replace-match " " t t nil 1)
               (replace-match
-               (format
-                "%-8s"
-                (mapconcat #'key-description
+               (string-pad
+                (mapconcat (lambda (key)
+                             (save-match-data
+                               (substitute-command-keys
+                                (format "\\`%s'" (key-description key)))))
                            (cl-remove-if (lambda (key) (eq (elt key 0) 
'menu-bar))
                                          (reverse (where-is-internal
                                                    cmd git-rebase-mode-map)))
-                           ", "))
+                           ", ")
+                8)
                t t nil 2))))))))
 
 (add-hook 'git-rebase-mode-hook #'git-rebase-mode-show-keybindings t)