# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1084353782 0
# Node ID 70c4138d3b8d50c7b402f4d9ee6220dfe4b45af4
# Parent  59e049798a0a3fc6ebc10cd0d68fa13918a1168a
* custom.el (defface): Document that type can have value gtk.
* faces.el (face-spec-set-match-display): Handle type gtk in display.

diff -r 59e049798a0a -r 70c4138d3b8d lisp/ChangeLog
--- a/lisp/ChangeLog	Wed May 12 02:42:42 2004 +0000
+++ b/lisp/ChangeLog	Wed May 12 09:23:02 2004 +0000
@@ -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 -r 59e049798a0a -r 70c4138d3b8d lisp/custom.el
--- a/lisp/custom.el	Wed May 12 02:42:42 2004 +0000
+++ b/lisp/custom.el	Wed May 12 09:23:02 2004 +0000
@@ -298,8 +298,8 @@
 
 `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 -r 59e049798a0a -r 70c4138d3b8d lisp/faces.el
--- a/lisp/faces.el	Wed May 12 02:42:42 2004 +0000
+++ b/lisp/faces.el	Wed May 12 09:23:02 2004 +0000
@@ -1309,9 +1309,12 @@
 				  (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)