mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
(command-line): Set it if the tool-bar is switched on at startup.
This commit is contained in:
Jason Rumney 2001-02-23 10:26:22 +00:00
parent 796ead7ee5
commit 3a55d3d027
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/startup.el
View file

@ -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