Mercurial > emacs

diff src/ChangeLog @ 67056:3ce17ff4a61f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(merge_face_vectors): Don't do :ignore-defface overwriting here. (Finternal_merge_in_global_face): Do it here.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 20 Nov 2005 22:35:48 +0000
parents 095993a59ddd
children a504d8ee277a
line wrap: on
line diff
--- a/src/ChangeLog	Sun Nov 20 19:21:20 2005 +0000
+++ b/src/ChangeLog	Sun Nov 20 22:35:48 2005 +0000
@@ -4,6 +4,8 @@
 	: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  <juri@jurta.org>