(command-line): Remove manipulation of frame

height for tool bars.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7317481ce827cf4e913e0b3cf623fe3fb797e1df..d43a7b527659f55efde413470a1424de0c3172a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-30  Gerd Moellmann  <gerd@gnu.org>
+
+       * frame.el (frame-initialize): Create initial frame visible.
+       (frame-notice-user-settings): When tool-bar has been switched off,
+       correct the frame size and sync too-bar-mode.
+
+       * startup.el (command-line): Remove manipulation of frame
+       height for tool bars.
+
 2001-01-30  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
        * lpr.el: Compatibility with XEmacs and doc fixes.

diff --git a/lisp/startup.el b/lisp/startup.el
index 65ceb28d22bb7267e68f9d02d4ab26dd42706860..46a62548a4d78b8de18560239c7680368b8268df 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -749,8 +749,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     (and command-line-args (setcdr command-line-args args)))
 
   ;; Under X Windows, this creates the X frame and deletes the terminal frame.
-  (if (fboundp 'frame-initialize)
-      (frame-initialize))
+  (when (fboundp 'frame-initialize)
+    (frame-initialize))
+
   ;; If frame was created with a menu bar, set menu-bar-mode on.
   (if (and (not noninteractive)
           (or (not (memq window-system '(x w32)))
@@ -935,23 +936,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
   (run-hooks 'after-init-hook)
 
-  ;; When the tool-bar is on, increase the frame's height by the
-  ;; number of lines it usually occupies.  The normal height of images
-  ;; in the tool bar is assumed to be `tool-bar-images-pixel-height'.
-  (when tool-bar-mode
-    (let* ((char-height (frame-char-height))
-          (bar-height (+ tool-bar-images-pixel-height
-                         tool-bar-button-margin
-                         tool-bar-button-relief))
-          (lines (/ (+ bar-height (1- char-height)) char-height)))
-      (set-frame-height nil (+ (frame-height) lines))))
-
-  ;; Now, make the frame visible.  If we make it visible before this
-  ;; point, ugly flickering can happens because of possibly changing
-  ;; frame heights.  Note that any message or error make the frame
-  ;; visible automatically.
-  (make-frame-visible)
-
   ;; If *scratch* exists and init file didn't change its mode, initialize it.
   (if (get-buffer "*scratch*")
       (save-excursion