(list-colors-duplicates): w32-default-color-map is a function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8367d64871be3158e6a46203042146595e00878d..3ecb79ab29c654fe928f5e9eb4b3456fc48f9969 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-18  Jason Rumney  <jasonr@gnu.org>
+
+       * facemenu.el (list-colors-duplicates): w32-default-color-map is
+       a function (Bug#3044).
+
 2009-04-18  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>
 
        * epa-file.el (epa-file-decode-and-insert): Use

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 51a71ad7d8e7f8fa6d9a1b087df8010190e1b9dd..a9f4f729edd847f6916ae611bd1f0e7200c0ace9 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -537,8 +537,8 @@ a list of colors that the current display can handle."
         (l list))
     (while (cdr l)
       (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l))))
-              (not (if (boundp 'w32-default-color-map)
-                       (not (assoc (car (car l)) w32-default-color-map)))))
+              (not (if (fboundp 'w32-default-color-map)
+                       (not (assoc (car (car l)) (w32-default-color-map))))))
          (progn
            (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l))))
            (setcdr l (cdr (cdr l))))