Use underline on all terminals that support it

* lisp/subr.el (read-multiple-choice): Use
display-supports-face-attributes-p instead of
display-graphic-p to determine whether we can use underlining.

diff --git a/lisp/subr.el b/lisp/subr.el
index 8e430bf98f5fb955ac1be584aa2ddd6bf965e388..f70f3edd028107a2f76a4e3be1161542e2ea16cd 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2268,7 +2268,8 @@ Usage example:
                         (format "[%c] %s" (car elem) name))
                        ;; The prompt character is in the name, so highlight
                        ;; it on graphical terminals...
-                       ((display-graphic-p)
+                       ((display-supports-face-attributes-p
+                         '(:underline t) (window-frame))
                         (setq name (copy-sequence name))
                         (put-text-property pos (1+ pos)
                                            'face 'read-multiple-choice-face