Mercurial > emacs
changeset 31910:b54fba72959b
(frame-notice-user-settings): Don't add a
tool-bar-lines frame parameter to default-frame-alist in batch
mode.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 26 Sep 2000 15:24:08 +0000 |
| parents | 36892782f26a |
| children | 8354221b2ced |
| files | lisp/frame.el |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/frame.el Tue Sep 26 13:05:29 2000 +0000 +++ b/lisp/frame.el Tue Sep 26 15:24:08 2000 +0000 @@ -229,8 +229,13 @@ (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)))