aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2009-04-18 13:52:29 +0000
committerJason Rumney2009-04-18 13:52:29 +0000
commitc3f9cd46616560e095cf9713b844e85268e0fca6 (patch)
tree8d4f4faf64b50e93e71427294fd9fde6ef02097a
parent973e784949e9089d3237277315a8c93ccb886422 (diff)
downloademacs-c3f9cd46616560e095cf9713b844e85268e0fca6.tar.gz
emacs-c3f9cd46616560e095cf9713b844e85268e0fca6.zip
(list-colors-duplicates): w32-default-color-map is a function.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/facemenu.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8367d64871b..3ecb79ab29c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-04-18 Jason Rumney <jasonr@gnu.org>
2
3 * facemenu.el (list-colors-duplicates): w32-default-color-map is
4 a function (Bug#3044).
5
12009-04-18 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> 62009-04-18 ARISAWA Akihiro <ari@mbf.ocn.ne.jp>
2 7
3 * epa-file.el (epa-file-decode-and-insert): Use 8 * 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."
537 (l list)) 537 (l list))
538 (while (cdr l) 538 (while (cdr l)
539 (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l)))) 539 (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l))))
540 (not (if (boundp 'w32-default-color-map) 540 (not (if (fboundp 'w32-default-color-map)
541 (not (assoc (car (car l)) w32-default-color-map))))) 541 (not (assoc (car (car l)) (w32-default-color-map))))))
542 (progn 542 (progn
543 (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l)))) 543 (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l))))
544 (setcdr l (cdr (cdr l)))) 544 (setcdr l (cdr (cdr l))))