# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 982923788 0
# Node ID 130c11089c1dbc7e911e7f0ad821c4999348bf71
# Parent  34ffe86aeeae6ab502c9cd65e4c2e7bc6ce2cd6b
*** empty log message ***

diff -r 34ffe86aeeae -r 130c11089c1d lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 23 10:20:27 2001 +0000
+++ b/lisp/ChangeLog	Fri Feb 23 10:23:08 2001 +0000
@@ -1,3 +1,11 @@
+2001-02-23  Jason Rumney  <jasonr@gnu.org>
+
+	* startup.el (tool-bar-originally-present): New variable.
+	(command-line): Set it if the tool-bar is switched on at startup.
+
+	* frame.el (frame-notice-user-settings): Only adjust frame height
+	for no tool-bar case if tool-bar was originally switched on.
+
 2001-02-22  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* server.el (server-switch-buffer): Only switch window if the