# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 968371848 0
# Node ID 1fc2f541f2a3c10e62b63ee5d835685bca3c53d8
# Parent  5ef4cd47578182870a467e4b5c03738a9d88eb7b
*** empty log message ***

diff -r 5ef4cd475781 -r 1fc2f541f2a3 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 08 00:06:44 2000 +0000
+++ b/src/ChangeLog	Fri Sep 08 00:10:48 2000 +0000
@@ -1,3 +1,10 @@
+2000-09-08  Miles Bader  <miles@gnu.org>
+
+	* xfaces.c (default_face_vector): Function removed.
+	(Finternal_merge_in_global_face): Restore old global/local
+	attribute override order.  Use inline loop instead of calling
+	default_face_vector.
+
 2000-09-07  Gerd Moellmann  <gerd@gnu.org>
 
 	* ralloc.c (obtain, relinquish, relinquish, r_alloc_size_in_use)