diff options
author | Gerd Moellmann <gerd@gnu.org> | 2001-01-30 15:07:08 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2001-01-30 15:07:08 +0000 |
commit | 45fe892fd4be6c48998e0f310af6b66a9206dec8 (patch) | |
tree | c969ad185af8eb75c360391222d973f6c062f3b8 | |
parent | 08cfe0a9574777f20b569bcfa0a2cb8cbfa78b23 (diff) | |
download | emacs-45fe892fd4be6c48998e0f310af6b66a9206dec8.tar.gz |
(command-line): Remove manipulation of frame
height for tool bars.
-rw-r--r-- | lisp/startup.el | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 65ceb28d22b..46a62548a4d 100644 --- 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 |