Mercurial > emacs
changeset 13433:21a9f15132d7
[win32] (face-menu-read-color, list-colors-display, facemenu-color-equal, face-menu-get-face):
Test for 'win32 window system as well as 'x.
| author | Geoff Voelker <voelker@cs.washington.edu> |
|---|---|
| date | Tue, 07 Nov 1995 07:48:36 +0000 |
| parents | c0c8b0a210e0 |
| children | 53ba95a88cf2 |
| files | lisp/facemenu.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/facemenu.el Tue Nov 07 07:48:12 1995 +0000 +++ b/lisp/facemenu.el Tue Nov 07 07:48:36 1995 +0000 @@ -412,7 +412,7 @@ "Read a color using the minibuffer." (let ((col (completing-read (or prompt "Color: ") (or facemenu-color-alist - (if (eq 'x window-system) + (if (or (eq window-system 'x) (eq window-system 'win32)) (mapcar 'list (x-defined-colors)))) nil t))) (if (equal "" col) @@ -426,7 +426,7 @@ colors to display. Otherwise, this command computes a list of colors that the current display can handle." (interactive) - (if (and (null list) (eq 'x window-system)) + (if (and (null list) (or (eq window-system 'x) (eq window-system 'win32))) (progn (setq list (x-defined-colors)) ;; Delete duplicate colors. @@ -461,7 +461,7 @@ color names mean. It returns nil if the colors differ or if it can't determine the correct answer." (cond ((equal a b) t) - ((and (eq 'x window-system) + ((and (or (eq window-system 'x) (eq window-system 'win32)) (equal (x-color-values a) (x-color-values b)))))) (defun facemenu-add-face (face start end) @@ -523,10 +523,10 @@ (color (substring name 3))) (cond ((string-match "^fg:" name) (set-face-foreground face color) - (and (eq 'x window-system) (x-color-defined-p color))) + (and (or (eq window-system 'x) (eq window-system 'win32)) (x-color-defined-p color))) ((string-match "^bg:" name) (set-face-background face color) - (and (eq 'x window-system) (x-color-defined-p color))) + (and (or (eq window-system 'x) (eq window-system 'win32)) (x-color-defined-p color))) (t)))) symbol))