3 files changed, 12 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd0227fdb17..dc31b41c7ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * custom.el (defface): Document that type can have value gtk.
+
+        * faces.el (face-spec-set-match-display): Handle type gtk in display.
+
 2004-05-12  Juanma Barranquero  <lektu@terra.es>
 
         * help-fns.el (help-split-fundoc, help-add-fundoc-usage):
diff --git a/lisp/custom.el b/lisp/custom.el
index a0aeeca659d..ae9d86cab00 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -298,8 +298,8 @@ following REQ are defined:
 
 `type' (the value of `window-system')
   Under X, in addition to the values `window-system' can take,
-  `motif', `lucid' and `x-toolkit' are allowed, and match when
-  the Motif toolkit, Lucid toolkit, or any X toolkit is in use.
+  `motif', `lucid', `gtk' and `x-toolkit' are allowed, and match when
+  the Motif toolkit, Lucid toolkit, GTK toolkit or any X toolkit is in use.
 
 `class' (the frame's color support)
   Should be one of `color', `grayscale', or `mono'.
diff --git a/lisp/faces.el b/lisp/faces.el
index 2480c6777dc..f04da872f4d 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1309,9 +1309,12 @@ If FRAME is nil, the current FRAME is used."
                                   (memq 'tty options))
                              (and (memq 'motif options)
                                   (featurep 'motif))
+                             (and (memq 'gtk options)
+                                  (featurep 'gtk))
                              (and (memq 'lucid options)
                                   (featurep 'x-toolkit)
-                                  (not (featurep 'motif)))
+                                  (not (featurep 'motif))
+                                  (not (featurep 'gtk)))
                              (and (memq 'x-toolkit options)
                                   (featurep 'x-toolkit))))
                         ((eq req 'min-colors)