master 43c0ebd8bc 2/2: * admin/gitmerge.el (gitmerge): Use substitute-command-keys.

[Stefan Kangas]

branch: master
commit 43c0ebd8bcdd33e534b514d87ea843e93b11b89d
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    * admin/gitmerge.el (gitmerge): Use substitute-command-keys.
---
 admin/gitmerge.el | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 4f7c66cc5c..ddd3e18442 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -634,12 +634,18 @@ Branch FROM will be prepended to the list."
       (with-current-buffer
          (gitmerge-setup-log-buffer gitmerge--commits gitmerge--from)
        (goto-char (point-min))
-       (insert (propertize "Commands: " 'font-lock-face 'bold)
-               "(s) Toggle skip, (l) Show log, (d) Show diff, "
-               "(f) Show files, (m) Start merge\n"
-               (propertize "Flags:    " 'font-lock-face 'bold)
-               "(C) Detected backport (cherry-mark), (R) Matches skip "
-               "regexp, (M) Manually picked\n\n")
+        (insert (substitute-command-keys
+                 (concat
+                  (propertize "Commands: " 'font-lock-face 'bold)
+                  "\\<gitmerge-mode-map>"
+                  "(\\[gitmerge-toggle-skip]) Toggle skip, "
+                  "(\\[gitmerge-show-log]) Show log, "
+                  "(\\[gitmerge-show-diff]) Show diff, "
+                  "(\\[gitmerge-show-files]) Show files, "
+                  "(\\[gitmerge-start-merge]) Start merge\n"
+                  (propertize "Flags:    " 'font-lock-face 'bold)
+                  "(C) Detected backport (cherry-mark), (R) Matches skip "
+                  "regexp, (M) Manually picked\n\n")))
        (gitmerge-mode)
        (pop-to-buffer (current-buffer))
        (if noninteractive (gitmerge-start-merge))))))