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

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Chong Yidong <address@hidden>   05/11/20 22:35:49

Modified files:
        src            : ChangeLog xfaces.c 

Log message:
        (merge_face_vectors): Don't do :ignore-defface overwriting here.
        (Finternal_merge_in_global_face): Do it here.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/ChangeLog.diff?tr1=1.4729&tr2=1.4730&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/xfaces.c.diff?tr1=1.341&tr2=1.342&r1=text&r2=text