diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-09-26 15:24:08 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-09-26 15:24:08 +0000 |
| commit | 33a33c06cf1df247d89d1eec667163dc7076e2e7 (patch) | |
| tree | e4490423900a4cdb76498ca0772d199d45d5b515 /lisp | |
| parent | 63900fcf00b94b4e474fbc07b66eeb4354bd084f (diff) | |
| download | emacs-33a33c06cf1df247d89d1eec667163dc7076e2e7.tar.gz | |
(frame-notice-user-settings): Don't add a
tool-bar-lines frame parameter to default-frame-alist in batch
mode.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 9b404a75356..743165e26e4 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -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))) |