[Emacs-commit] emacs/src xfaces.c frame.c

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/05/16 11:10:18

Modified files:
        src            : xfaces.c frame.c 

Log message:
        frame.c (Fdelete_frame): Don't call font_update_drviers if
        HAVE_WINDOW_SYSTEM is not defined.
        xfaces.c (merge_face_ref, merge_face_vectors)
        (Finternal_set_lisp_face_attribute): Use FONT_*_INDEX only when
        HAVE_WINDOW_SYSTEM is defined.
        (Fface_font): Fix non-HAVE_WINDOW_SYSTEM case.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.383&r2=1.384
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.372&r2=1.373