Fix read-multiple-choice tests

* lisp/emacs-lisp/rmc.el (rmc--add-key-description): Fix typo.
* test/lisp/emacs-lisp/rmc-tests.el
(test-rmc--add-key-description)
(test-rmc--add-key-description/with-attributes)
(test-rmc--add-key-description/non-graphical-display): Fix tests.

diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index 9d5fe40f9aa46cd4f807637a4e9fb965c6fafc9f..ed764f5350e3aab4676867161d2647c6fb6887ec 100644 (file)
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -41,7 +41,7 @@
             (format "%s %s"
                     (if graphical-terminal
                         (propertize desc 'face 'read-multiple-choice-face)
-                      (propertize desc 'face 'help-key-name))
+                      (propertize desc 'face 'help-key-binding))
                     name))
            ;; The prompt character is in the name, so highlight
            ;; it on graphical terminals.

diff --git a/test/lisp/emacs-lisp/rmc-tests.el b/test/lisp/emacs-lisp/rmc-tests.el
index 5a79c505ae29846a662e70e4363a2c7e669926a4..c1e838d051e3bda36399611b1908af4bd25ad1a7 100644 (file)
--- a/test/lisp/emacs-lisp/rmc-tests.el
+++ b/test/lisp/emacs-lisp/rmc-tests.el
@@ -34,9 +34,9 @@
     (should (equal (rmc--add-key-description '(?y "yes"))
                    '(?y . "yes")))
     (should (equal (rmc--add-key-description '(?n "foo"))
-                   '(?n . "[n] foo")))
+                   '(?n . "n foo")))
     (should (equal (rmc--add-key-description '(?\s "foo bar"))
-                   `(?\s . "[SPC] foo bar")))))
+                   `(?\s . "SPC foo bar")))))
 
 (ert-deftest test-rmc--add-key-description/with-attributes ()
   (cl-letf (((symbol-function 'display-supports-face-attributes-p) (lambda (_ _) t)))
@@ -45,10 +45,10 @@
              `(?y . ,(concat (propertize "y" 'face 'read-multiple-choice-face) "es"))))
     (should (equal-including-properties
              (rmc--add-key-description '(?n "foo"))
-             `(?n . ,(concat "[" (propertize "n" 'face 'read-multiple-choice-face) "] foo"))))
+             `(?n . ,(concat (propertize "n" 'face 'read-multiple-choice-face) " foo"))))
     (should (equal-including-properties
              (rmc--add-key-description '(?\s "foo bar"))
-             `(?\s . ,(concat "[" (propertize "SPC" 'face 'read-multiple-choice-face) "] foo bar"))))))
+             `(?\s . ,(concat (propertize "SPC" 'face 'read-multiple-choice-face) " foo bar"))))))
 
 (ert-deftest test-rmc--add-key-description/non-graphical-display ()
   (cl-letf (((symbol-function 'display-supports-face-attributes-p) (lambda (_ _) nil)))
@@ -57,7 +57,7 @@
              '(?y . "[Y]es")))
     (should (equal-including-properties
              (rmc--add-key-description '(?n "foo"))
-             '(?n . "[n] foo")))))
+             `(?n . ,(concat (propertize "n" 'face 'help-key-binding) " foo"))))))
 
 (ert-deftest test-read-multiple-choice ()
   (dolist (char '(?y ?n))