From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 21 Sep 2022 08:11:15 +0000 (+0200)
Subject: * admin/gitmerge.el (gitmerge): Use substitute-command-keys.
X-Git-Tag: emacs-29.0.90~1856^2~335
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43c0ebd8bcdd33e534b514d87ea843e93b11b89d;p=emacs.git

* admin/gitmerge.el (gitmerge): Use substitute-command-keys.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 4f7c66cc5c2..ddd3e184424 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))))))