Commit 3a55d3d0 authored by Jason Rumney's avatar Jason Rumney
Browse files

(tool-bar-originally-present): New variable.

(command-line): Set it if the tool-bar is switched on at startup.
parent 796ead7e
......@@ -532,6 +532,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(defconst tool-bar-images-pixel-height 24
"Height in pixels of images in the tool bar.")
(defvar tool-bar-originally-present nil
"Non-nil if tool-bars are present before user and site init files are read.")
;; Handle the X-like command line parameters "-fg", "-bg", "-name", etc.
(defun tty-handle-args (args)
(let ((rest nil))
......@@ -804,6 +807,18 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
;; use the right colors, so clear them.
(clear-face-cache)))
;; Record whether the tool-bar is present before the user and site
;; init files are processed. frame-notice-user-settings uses this
;; to determine if the tool-bar has been disabled by the init files,
;; and the frame needs to be resized.
(when (fboundp 'frame-notice-user-settings)
(let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
(assq 'tool-bar-lines default-frame-alist))))
(setq tool-bar-originally-present
(not (or (null tool-bar-lines)
(null (cdr tool-bar-lines))
((eq 0 (cdr tool-bar-lines))))))))
(run-hooks 'before-init-hook)
;; Run the site-start library if it exists. The point of this file is
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment