read-multiple-choice: Improve key formatting

* lisp/emacs-lisp/rmc.el (rmc--add-key-description): Improve
formatting of key missing in the description.  Use face help-key-name
on terminals that can't display underline.

diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index 522d395eba70eb4229c0324f7d965f0081772d12..9d5fe40f9aa46cd4f807637a4e9fb965c6fafc9f 100644 (file)
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -38,10 +38,10 @@
            ;; Not in the name string, or a special character.
            ((or (not pos)
                 (member desc '("ESC" "TAB" "RET" "DEL" "SPC")))
-            (format "[%s] %s"
+            (format "%s %s"
                     (if graphical-terminal
                         (propertize desc 'face 'read-multiple-choice-face)
-                      desc)
+                      (propertize desc 'face 'help-key-name))
                     name))
            ;; The prompt character is in the name, so highlight
            ;; it on graphical terminals.