diff options
| author | Gerd Moellmann | 1999-10-06 23:32:26 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-10-06 23:32:26 +0000 |
| commit | ee716db5e0b22c2f197fec91caff0c24024b5830 (patch) | |
| tree | 6cb75657b8b3fb0866236cc888b6e50542b4d72d | |
| parent | f5737ad232425a220af84e5d3fed343329112539 (diff) | |
| download | emacs-ee716db5e0b22c2f197fec91caff0c24024b5830.tar.gz emacs-ee716db5e0b22c2f197fec91caff0c24024b5830.zip | |
(face-spec-set-match-display): Recognize `type' of
`motif', `lucid', `x-toolkit'.
(menu): New face.
| -rw-r--r-- | lisp/faces.el | 17 |
1 files changed, 16 insertions, 1 deletions
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." | |||
| 1047 | match (cond ((eq req 'type) | 1047 | match (cond ((eq req 'type) |
| 1048 | (or (memq window-system options) | 1048 | (or (memq window-system options) |
| 1049 | (and (null window-system) | 1049 | (and (null window-system) |
| 1050 | (memq 'tty options)))) | 1050 | (memq 'tty options)) |
| 1051 | (and (memq 'motif options) | ||
| 1052 | (featurep 'motif)) | ||
| 1053 | (and (memq 'lucid options) | ||
| 1054 | (featurep 'x-toolkit) | ||
| 1055 | (not (featurep 'motif))) | ||
| 1056 | (and (memq 'x-toolkit options) | ||
| 1057 | (featurep 'x-toolkit)))) | ||
| 1051 | ((eq req 'class) | 1058 | ((eq req 'class) |
| 1052 | (memq (frame-parameter frame 'display-type) options)) | 1059 | (memq (frame-parameter frame 'display-type) options)) |
| 1053 | ((eq req 'background) | 1060 | ((eq req 'background) |
| @@ -1427,6 +1434,14 @@ created." | |||
| 1427 | :group 'basic-faces) | 1434 | :group 'basic-faces) |
| 1428 | 1435 | ||
| 1429 | 1436 | ||
| 1437 | (defface menu | ||
| 1438 | '((((type x-toolkit)) ()) | ||
| 1439 | (t (:inverse-video t))) | ||
| 1440 | "Basic menu face." | ||
| 1441 | :version "21.1" | ||
| 1442 | :group 'basic-faces) | ||
| 1443 | |||
| 1444 | |||
| 1430 | (defface border '() | 1445 | (defface border '() |
| 1431 | "Basic face for the frame border under X." | 1446 | "Basic face for the frame border under X." |
| 1432 | :version "21.1" | 1447 | :version "21.1" |