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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/15 21:32:03

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6880
retrieving revision 1.6881
diff -u -b -r1.6880 -r1.6881
--- ChangeLog   15 Aug 2008 20:17:02 -0000      1.6880
+++ ChangeLog   15 Aug 2008 21:32:01 -0000      1.6881
@@ -1,5 +1,10 @@
 2008-08-15  Chong Yidong  <address@hidden>
 
+       * xfaces.c (lookup_derived_face): Properly handle possible zero
+       return value of get_lface_attributes.
+       (merge_faces): Don't tell lookup_derived_face to signal an error
+       if face is not found.
+
        * dired.c (Fdirectory_files): Doc fix.
 
        * process.c (make_process): Initialize kill_without_query struct