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

c3f9cd46 · Jason Rumney · 973e7849 · c3f9cd46 · c3f9cd46
Commit c3f9cd46 authored Apr 18, 2009 by Jason Rumney
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/facemenu.el lisp/facemenu.el +2 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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

--- 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))))