# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 968422844 0
# Node ID 5416fcb729d78be25743f5b42a944c6cf4fcd962
# Parent  ac6d049932e9f9bc2b62b2257fff68b318d61674
*** empty log message ***

diff -r ac6d049932e9 -r 5416fcb729d7 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 08 14:19:31 2000 +0000
+++ b/lisp/ChangeLog	Fri Sep 08 14:20:44 2000 +0000
@@ -1,3 +1,8 @@
+2000-09-08  Gerd Moellmann  <gerd@gnu.org>
+
+	* faces.el (face-spec-set): Only face-spec-reset-face when
+	ATTRS is non-nil.
+
 2000-09-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* help.el (help-insert-xref-button): Fix a typo in doc string.
@@ -74,7 +79,7 @@
 
 	* international/quail.el: Don't require face.
 	(quail): New group.
-	(quail-other-command): Dummy command to make quail-help works
+	(quail-other-command): Dummy command to make quail-help work
 	better.
 	(quail-keyboard-layout-alist): Add Keyboard type "jp106".
 	(quail-keyboard-layout-substitution): New variable.
diff -r ac6d049932e9 -r 5416fcb729d7 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 08 14:19:31 2000 +0000
+++ b/src/ChangeLog	Fri Sep 08 14:20:44 2000 +0000
@@ -1,5 +1,11 @@
 2000-09-08  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (Finternal_merge_in_global_face): Return a Lisp object.
+
+	* xdisp.c (dump_glyph_row): Fix printf format string.
+	(display_line, move_it_in_display_line_to): Avoid compiler
+	warnings.
+
 	* s/freebsd.h (GC_MARK_STACK, REL_ALLOC_MMAP): Define.
 
 	* keymap.c (Fset_keymap_parent): Check for cycles in keymap