[nongnu] elpa/git-commit c8df0fe620: git-rebase-mode-show-keybindings: fix key display for mapped commands

[ELPA Syncer]

branch: elpa/git-commit
commit c8df0fe620ffa4bff712aaded68db25f600c965b
Author: Sean Farley <sean@farley.io>
Commit: Sean Farley <sean@farley.io>

    git-rebase-mode-show-keybindings: fix key display for mapped commands
    
    This is a regression from 5ddf251 which addressed a font lock change in
    Emacs 28.1. That commit routed `git-rebase-command-descriptions' through
    `substitute-command-keys' to propertize them but commands (and therefore
    the keys) in `git-rebase-*' were then rendered, for example, as \'c'.
    
    This patch routes all the mapped commands through
    `substitute-command-keys' so that users have a consistent rendering:
    either all of the keys are not font locked (Emacs 27) or they are font
    locked (Emacs 28 and beyond).
---
 lisp/git-rebase.el | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index 61cdf37007..7ac3ab6a33 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -806,14 +806,8 @@ By default, this is the same except for the \"pick\" 
command."
                 (replace-match " " t t nil 2)
                 (replace-match
                  (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)))
-                             ", ")
+                  (save-match-data
+                    (substitute-command-keys (format "\\[%s]" cmd)))
                   8)
                  t t nil 3)))))))))