aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-07-08 17:27:19 +0000
committerChong Yidong2008-07-08 17:27:19 +0000
commit7f000038fe3ba49e2cd2ba64de858bdbbca5f8e3 (patch)
tree685d44cf372c07d760c4302705ae4b3d62938ec8
parentfa7015f4eaa5645dc7b39a3e963df74918a3b04a (diff)
downloademacs-7f000038fe3ba49e2cd2ba64de858bdbbca5f8e3.tar.gz
emacs-7f000038fe3ba49e2cd2ba64de858bdbbca5f8e3.zip
* xfaces.c (Finternal_merge_in_global_face): Save merged
attributes for the default face back into the face vector.
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 38875ef3bef..7a0b990467a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-07-08 Chong Yidong <cyd@stupidchicken.com>
2
3 * xfaces.c (Finternal_merge_in_global_face): Save merged
4 attributes for the default face back into the face vector.
5
12008-07-08 Andreas Schwab <schwab@suse.de> 62008-07-08 Andreas Schwab <schwab@suse.de>
2 7
3 * fontset.h: Declare fontset_from_font. Don't declare 8 * fontset.h: Declare fontset_from_font. Don't declare