# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1288112171 25200
# Node ID a514b8e891c06864a73c4a77fda934a0616193f0
# Parent  ed5bac97776a1ee7af0a3f88a9192cf8ba7a9ee6
* lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.

diff -r ed5bac97776a -r a514b8e891c0 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 26 16:20:00 2010 +0300
+++ b/lisp/ChangeLog	Tue Oct 26 09:56:11 2010 -0700
@@ -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 -r ed5bac97776a -r a514b8e891c0 lisp/term/common-win.el
--- a/lisp/term/common-win.el	Tue Oct 26 16:20:00 2010 +0300
+++ b/lisp/term/common-win.el	Tue Oct 26 09:56:11 2010 -0700
@@ -463,15 +463,15 @@
 
 (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