*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 296a36e45b34435fcc77ba8bc4c249a1950fbb9a..e89ce1f7e81c654f664685a6d484fcc71d514325 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-26  Gerd Moellmann  <gerd@gnu.org>
 
+       * frame.el (frame-notice-user-settings): Make tool-bar-mode and
+       default-frame-alist consistent.
+
        * toolbar/tool-bar.el (tool-bar-help): New function.
 
 2000-09-25  Gerd Moellmann  <gerd@gnu.org>

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d5007bd02c874fa34c994e8335d92495eeee6df..6dcbbbb1ed6f46e30043a6471eaec336d41171e6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 2000-09-26  Gerd Moellmann  <gerd@gnu.org>
 
+       * window.c (freeze_window_starts): Construct last argument for
+       foreach_window differently.
+
+       * xfns.c (x_decode_color): Don't return a Lisp_Object.
+
+       * lisp.h (union Lisp_Object) [!NO_UNION_TYPE]: Use EMACS_INT and
+       EMACS_UINT instead of `int' and `unsigned int'.
+       (XSET) [EXPLICIT_SIGN_EXTEND]: Use EMACS_INT instead of `int'.
+
+       * frame.h (struct frame): Make the `nothing' member of union
+       output_data an EMACS_INT.
+
        * alloc.c (GC_CHECK_STRING_BYTES): Temporarily define, for bug
        hunting.
        (struct sdata) [GC_CHECK_STRING_BYTES]: Always record the string's