Mercurial > emacs
comparison lisp/faces.el @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | 0118fa0c9112 f91f3db3c52a |
children | 6f039e9c742f |
comparison
equal
deleted
inserted
replaced
90427:ddb25860d044 | 90428:a8190f7e546e |
---|---|
1574 | 1574 |
1575 (defun defined-colors (&optional frame) | 1575 (defun defined-colors (&optional frame) |
1576 "Return a list of colors supported for a particular frame. | 1576 "Return a list of colors supported for a particular frame. |
1577 The argument FRAME specifies which frame to try. | 1577 The argument FRAME specifies which frame to try. |
1578 The value may be different for frames on different display types. | 1578 The value may be different for frames on different display types. |
1579 If FRAME doesn't support colors, the value is nil." | 1579 If FRAME doesn't support colors, the value is nil. |
1580 If FRAME is nil, that stands for the selected frame." | |
1580 (if (memq (framep (or frame (selected-frame))) '(x w32 mac)) | 1581 (if (memq (framep (or frame (selected-frame))) '(x w32 mac)) |
1581 (xw-defined-colors frame) | 1582 (xw-defined-colors frame) |
1582 (mapcar 'car (tty-color-alist frame)))) | 1583 (mapcar 'car (tty-color-alist frame)))) |
1583 (defalias 'x-defined-colors 'defined-colors) | 1584 (defalias 'x-defined-colors 'defined-colors) |
1584 | 1585 |