From: Glenn Morris <rgm@gnu.org>
Date: Tue, 26 Oct 2010 16:56:11 +0000 (-0700)
Subject: * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~451
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b94a5a43d1c117473b57db9bd9f6a07162a0351a;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21f1dd1fd4f..4c9da0868cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
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