[Emacs-diffs] emacs/lisp ChangeLog facemenu.el

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/04/18 13:50:24

Modified files:
        lisp           : ChangeLog facemenu.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15600&r2=1.15601
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/facemenu.el?cvsroot=emacs&r1=1.107&r2=1.108

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15600
retrieving revision 1.15601
diff -u -b -r1.15600 -r1.15601
--- ChangeLog   18 Apr 2009 04:55:50 -0000      1.15600
+++ ChangeLog   18 Apr 2009 13:50:08 -0000      1.15601
@@ -1,3 +1,8 @@
+2009-04-18  Jason Rumney  <address@hidden>
+
+       * facemenu.el (list-colors-duplicates): w32-default-color-map is
+       a function.
+
 2009-04-18  ARISAWA Akihiro  <address@hidden>
 
        * epa-file.el (epa-file-decode-and-insert): Use

Index: facemenu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/facemenu.el,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- facemenu.el 5 Jan 2009 03:19:07 -0000       1.107
+++ facemenu.el 18 Apr 2009 13:50:23 -0000      1.108
@@ -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))))