[Emacs-commit] emacs/src ChangeLog

[Chong Yidong]

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

Modified files:
        src            : ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.6880&r2=1.6881