procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.

Browse source
This commit is contained in:
Glenn Morris 2010-10-26 09:56:11 -07:00
parent fc3eda0471
commit b94a5a43d1
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2010-10-26 Glenn Morris <rgm@gnu.org>
* term/common-win.el (xw-defined-colors): Simplify the 'ns case.
2010-10-26 Adrian Robert <Adrian.B.Robert@gmail.com>
* term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to

20
lisp/term/common-win.el
View file

@ -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