From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 6 Oct 1999 23:32:26 +0000 (+0000)
Subject: (face-spec-set-match-display): Recognize `type' of
X-Git-Tag: emacs-pretest-21.0.90~6555
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee716db5e0b22c2f197fec91caff0c24024b5830;p=emacs.git

(face-spec-set-match-display): Recognize `type' of
`motif', `lucid', `x-toolkit'.
(menu): New face.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 3edd33ae546..6c7476507d0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1047,7 +1047,14 @@ If FRAME is nil, the current FRAME is used."
 	    match (cond ((eq req 'type)
 			 (or (memq window-system options)
 			     (and (null window-system)
-				  (memq 'tty options))))
+				  (memq 'tty options))
+			     (and (memq 'motif options)
+				  (featurep 'motif))
+			     (and (memq 'lucid options)
+				  (featurep 'x-toolkit)
+				  (not (featurep 'motif)))
+			     (and (memq 'x-toolkit options)
+				  (featurep 'x-toolkit))))
 			((eq req 'class)
 			 (memq (frame-parameter frame 'display-type) options))
 			((eq req 'background)
@@ -1427,6 +1434,14 @@ created."
   :group 'basic-faces)
 
 
+(defface menu
+  '((((type x-toolkit)) ())
+    (t (:inverse-video t)))
+  "Basic menu face."
+  :version "21.1"
+  :group 'basic-faces)
+
+
 (defface border '()
   "Basic face for the frame border under X."
   :version "21.1"