[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/02/05 02:36:41

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6114
retrieving revision 1.6115
diff -u -b -r1.6114 -r1.6115
--- ChangeLog   4 Feb 2008 15:42:57 -0000       1.6114
+++ ChangeLog   5 Feb 2008 02:36:40 -0000       1.6115
@@ -1,3 +1,9 @@
+2008-02-05  Miles Bader  <address@hidden>
+
+       * xfaces.c (get_lface_attributes, merge_named_face)
+       (lookup_named_face, lookup_derived_face, realize_named_face):
+       Revert 2008-02-01 change by address@hidden
+
 2008-02-04  Kenichi Handa  <address@hidden>
 
        * fontset.c (Ffontset_info): Handle the case of inhibitting the