# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1240062608 0
# Node ID 7fb0884440b3555e007fb90457a1fe0e1c2a6e5c
# Parent  413229f94ec73af7b10d65ae57ff1bff16e75227
(list-colors-duplicates): w32-default-color-map is a function.

diff -r 413229f94ec7 -r 7fb0884440b3 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 18 13:29:59 2009 +0000
+++ b/lisp/ChangeLog	Sat Apr 18 13:50:08 2009 +0000
@@ -1,3 +1,8 @@
+2009-04-18  Jason Rumney  <jasonr@gnu.org>
+
+	* facemenu.el (list-colors-duplicates): w32-default-color-map is
+	a function.
+
 2009-04-18  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>
 
 	* epa-file.el (epa-file-decode-and-insert): Use
diff -r 413229f94ec7 -r 7fb0884440b3 lisp/facemenu.el
--- a/lisp/facemenu.el	Sat Apr 18 13:29:59 2009 +0000
+++ b/lisp/facemenu.el	Sat Apr 18 13:50:08 2009 +0000
@@ -537,8 +537,8 @@
 	 (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))))