From 787030b0212d5933c3e4a16ece60b4e2ba8caea4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 26 Dec 2021 00:45:50 +0100 Subject: read-multiple-choice: Add face when key not in name string * lisp/emacs-lisp/rmc.el (rmc--add-key-description): Add face property also when key is not in the name string. * test/lisp/emacs-lisp/rmc-tests.el (test-rmc--add-key-description/with-attributes) (test-rmc--add-key-description/non-graphical-display): Update tests. --- test/lisp/emacs-lisp/rmc-tests.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/lisp/emacs-lisp') diff --git a/test/lisp/emacs-lisp/rmc-tests.el b/test/lisp/emacs-lisp/rmc-tests.el index e858ed39405..a97254c46dc 100644 --- a/test/lisp/emacs-lisp/rmc-tests.el +++ b/test/lisp/emacs-lisp/rmc-tests.el @@ -22,8 +22,6 @@ ;;; Commentary: -;; - ;;; Code: (require 'ert) @@ -45,13 +43,16 @@ `(?y . ,(concat (propertize "y" 'face 'read-multiple-choice-face) "es")))) (should (equal-including-properties (rmc--add-key-description '(?n "foo")) - '(?n . "[n] foo"))))) + `(?n . ,(concat "[" (propertize "n" 'face 'read-multiple-choice-face) "] foo")))))) (ert-deftest test-rmc--add-key-description/non-graphical-display () (cl-letf (((symbol-function 'display-supports-face-attributes-p) (lambda (_ _) nil))) (should (equal-including-properties (rmc--add-key-description '(?y "yes")) - '(?y . "[Y]es"))))) + '(?y . "[Y]es"))) + (should (equal-including-properties + (rmc--add-key-description '(?n "foo")) + '(?n . "[n] foo"))))) (ert-deftest test-read-multiple-choice () (dolist (char '(?y ?n)) @@ -60,6 +61,5 @@ (should (equal (list char str) (read-multiple-choice "Do it? " '((?y "yes") (?n "no")))))))) - (provide 'rmc-tests) ;;; rmc-tests.el ends here -- cgit v1.2.3