(frame-notice-user-settings): Only adjust frame height

for no tool-bar case if tool-bar was originally switched on.

2 files changed, 13 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59c088f516..d6e4e75cfe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-23  Jason Rumney  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* server.el (server-switch-buffer): Only switch window if the
diff --git a/lisp/frame.el b/lisp/frame.el
index 3def9a94ae..c05347c2d4 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -292,11 +292,12 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
       (when (display-graphic-p)
 	(let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
 				  (assq 'tool-bar-lines default-frame-alist))))
-	  (when (or (null tool-bar-lines)
-		    (null (cdr tool-bar-lines))
-		    (eq 0 (cdr tool-bar-lines)))
+	  (when (and tool-bar-originally-present
+                     (or (null tool-bar-lines)
+                         (null (cdr tool-bar-lines))
+                         (eq 0 (cdr tool-bar-lines))))
 	    (let* ((char-height (frame-char-height frame-initial-frame))
-		   (image-height 24)
+		   (image-height tool-bar-images-pixel-height)
 		   (margin (cond ((and (consp tool-bar-button-margin)
 				       (integerp (cdr tool-bar-button-margin))
 				       (> tool-bar-button-margin 0))