Mercurial > emacs
comparison lisp/term/common-win.el @ 111192:a514b8e891c0
* lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 26 Oct 2010 09:56:11 -0700 |
| parents | ed5bac97776a |
| children | 8f6857157cb5 |
comparison
equal
deleted
inserted
replaced
| 111191:ed5bac97776a | 111192:a514b8e891c0 |
|---|---|
| 461 | 461 |
| 462 (defvar w32-color-map) | 462 (defvar w32-color-map) |
| 463 | 463 |
| 464 (defun xw-defined-colors (&optional frame) | 464 (defun xw-defined-colors (&optional frame) |
| 465 "Internal function called by `defined-colors', which see." | 465 "Internal function called by `defined-colors', which see." |
| 466 (or frame (setq frame (selected-frame))) | 466 (if (featurep 'ns) |
| 467 ;; FIXME for ns, this is just... x-colors. | 467 x-colors |
| 468 (let (defined-colors) | 468 (or frame (setq frame (selected-frame))) |
| 469 (dolist (this-color (if (eq system-type 'windows-nt) | 469 (let (defined-colors) |
| 470 (or (mapcar 'car w32-color-map) x-colors) | 470 (dolist (this-color (if (eq system-type 'windows-nt) |
| 471 x-colors)) | 471 (or (mapcar 'car w32-color-map) x-colors) |
| 472 (and (or (color-supported-p this-color frame t) | 472 x-colors)) |
| 473 (featurep 'ns)) | 473 (and (color-supported-p this-color frame t) |
| 474 (setq defined-colors (cons this-color defined-colors)))) | 474 (setq defined-colors (cons this-color defined-colors)))) |
| 475 defined-colors)) | 475 defined-colors))) |
| 476 | 476 |
| 477 ;;; common-win.el ends here | 477 ;;; common-win.el ends here |