[Emacs-diffs] /srv/bzr/emacs/trunk r102113: * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.

[Glenn Morris]

------------------------------------------------------------
revno: 102113
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-26 09:56:11 -0700
message:
  * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
modified:
  lisp/ChangeLog
  lisp/term/common-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-26 13:20:00 +0000
+++ b/lisp/ChangeLog    2010-10-26 16:56:11 +0000
@@ -1,3 +1,7 @@
+2010-10-26  Glenn Morris  <address@hidden>
+
+       * term/common-win.el (xw-defined-colors): Simplify the 'ns case.
+
 2010-10-26  Adrian Robert  <address@hidden>
 
        * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to

=== modified file 'lisp/term/common-win.el'
--- a/lisp/term/common-win.el   2010-10-26 13:20:00 +0000
+++ b/lisp/term/common-win.el   2010-10-26 16:56:11 +0000
@@ -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