(button): Use underline if supported, else fall back to color.

diff --git a/lisp/button.el b/lisp/button.el
index 8c3681854e77c4fdbe1e1e0cfbe326b511aded9e..ebc078f81932b85e9a06d71ef75ef0742b7360c1 100644 (file)
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -52,11 +52,12 @@
 ;; Globals
 
 ;; Use color for the MS-DOS port because it doesn't support underline.
-;; Also for the linux console.
+;; FIXME if MS-DOS correctly answers the (supports) question, it need
+;; no longer be a special case.
 (defface button '((((type pc) (class color))
                   (:foreground "lightblue"))
-                 (((type tty)) (:inherit link))
-                 (t :underline t))
+                 (((supports :underline t)) :underline t)
+                 (t (:foreground "lightblue")))
   "Default face used for buttons."
   :group 'basic-faces)