diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-26 09:56:11 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-26 09:56:11 -0700 |
| commit | b94a5a43d1c117473b57db9bd9f6a07162a0351a (patch) | |
| tree | a921b9e61b7ef069e1269b2c65e64c77fe1485a7 /lisp/term | |
| parent | fc3eda047183f796653610f43117098bf0155210 (diff) | |
| download | emacs-b94a5a43d1c117473b57db9bd9f6a07162a0351a.tar.gz | |
* lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/common-win.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el index 8e0953688f3..0df5e57ee27 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el @@ -463,15 +463,15 @@ the operating system.") (defun xw-defined-colors (&optional frame) "Internal function called by `defined-colors', which see." - (or frame (setq frame (selected-frame))) - ;; FIXME for ns, this is just... x-colors. - (let (defined-colors) - (dolist (this-color (if (eq system-type 'windows-nt) - (or (mapcar 'car w32-color-map) x-colors) - x-colors)) - (and (or (color-supported-p this-color frame t) - (featurep 'ns)) - (setq defined-colors (cons this-color defined-colors)))) - defined-colors)) + (if (featurep 'ns) + x-colors + (or frame (setq frame (selected-frame))) + (let (defined-colors) + (dolist (this-color (if (eq system-type 'windows-nt) + (or (mapcar 'car w32-color-map) x-colors) + x-colors)) + (and (color-supported-p this-color frame t) + (setq defined-colors (cons this-color defined-colors)))) + defined-colors))) ;;; common-win.el ends here |