*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 170fff01134c3c64bac9c39bb7ab8918381f3791..2fbd738ae20a2a37beefdf714bcfba0f35553b3a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 8890208932549abd89cf090405e65bfd1255750a..03589ba0c81b0ccd014303984a7c4632ceccfdfd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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