[Emacs-commit] emacs/src xfaces.c

[Chong Yidong]

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

Modified files:
        src            : xfaces.c 

Log message:
        (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/xfaces.c?cvsroot=emacs&r1=1.411&r2=1.412