# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969971859 0
# Node ID d459e68ca9e8bf737617814b699d5109a44236b6
# Parent  3e0a1f91c1490d2cbc0531b0b3d1f80549a9d5a7
*** empty log message ***

diff -r 3e0a1f91c149 -r d459e68ca9e8 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 26 12:36:55 2000 +0000
+++ b/lisp/ChangeLog	Tue Sep 26 12:37:39 2000 +0000
@@ -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 -r 3e0a1f91c149 -r d459e68ca9e8 src/ChangeLog
--- a/src/ChangeLog	Tue Sep 26 12:36:55 2000 +0000
+++ b/src/ChangeLog	Tue Sep 26 12:37:39 2000 +0000
@@ -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