procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jason Rumney 2009-04-18 13:52:29 +00:00
parent 973e784949
commit c3f9cd4661
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

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

4
lisp/facemenu.el
View file

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