From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 18 Apr 2009 13:52:29 +0000 (+0000)
Subject: (list-colors-duplicates): w32-default-color-map is a function.
X-Git-Tag: emacs-pretest-23.0.93~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3f9cd46616560e095cf9713b844e85268e0fca6;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8367d64871b..3ecb79ab29c 100644
--- 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 51a71ad7d8e..a9f4f729edd 100644
--- 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))))