mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-15 04:11:53 -08:00
Code Issues Projects Releases Wiki Activity

(frame-notice-user-settings): Don't add a

Browse source 
tool-bar-lines frame parameter to default-frame-alist in batch
mode.
This commit is contained in:
Gerd Moellmann 2000-09-26 15:24:08 +00:00
parent 63900fcf00
commit 33a33c06cf
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/frame.el
View file

@ -229,8 +229,13 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
(cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
default-frame-alist)))))
;; Make tool-bar-mode and default-frame-alist consistent.
(when (boundp 'tool-bar-mode)
;; Make tool-bar-mode and default-frame-alist consistent. Don't do
;; it in batch mode since that would leave a tool-bar-lines
;; parameter in default-frame-alist in a dumped Emacs, which is not
;; what we want. For some reason, menu-bar-mode is not bound
;; in this case, but tool-bar-mode is.
(when (and (boundp 'tool-bar-mode)
(not noninteractive))
(let ((default (assq 'tool-bar-lines default-frame-alist)))
(if default
(setq tool-bar-mode (not (eq (cdr default) 0)))