procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stefan Kangas 2022-09-21 10:11:15 +02:00
parent 00f6bb1286
commit 43c0ebd8bc
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
admin/gitmerge.el
View file

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