[Emacs-diffs] Changes to emacs/src/ChangeLog

[Chong Yidong]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4729 emacs/src/ChangeLog:1.4730
*** emacs/src/ChangeLog:1.4729  Sun Nov 20 15:22:31 2005
--- emacs/src/ChangeLog Sun Nov 20 22:35:47 2005
***************
*** 4,9 ****
--- 4,11 ----
        :ignore-defface for new frame defaults when `unspecified' is
        supplied.
        (Finternal_get_lisp_face_attribute): Hide :ignore-defface.
+       (merge_face_vectors): Don't do :ignore-defface overwriting here.
+       (Finternal_merge_in_global_face): Do it here.
  
  2005-11-20  Juri Linkov  <address@hidden>