Mercurial > emacs
changeset 55545:70c4138d3b8d
* custom.el (defface): Document that type can have value gtk.
* faces.el (face-spec-set-match-display): Handle type gtk in display.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 12 May 2004 09:23:02 +0000 |
| parents | 59e049798a0a |
| children | 4e3b166f7f72 |
| files | lisp/ChangeLog lisp/custom.el lisp/faces.el |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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'.
--- 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)