[Emacs-commit] emacs/src xfaces.c

[Kim F . Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Kim F. Storm <address@hidden>   05/01/10 13:35:11

Modified files:
        src            : xfaces.c 

Log message:
        (merge_faces): Rename from merge_into_realized_face.
        Callers changed.
        Add support to merge with lisp face id too (if face_name is t).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/xfaces.c.diff?tr1=1.309&tr2=1.310&r1=text&r2=text