# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969981848 0
# Node ID b54fba72959b9a981642fdd26da92b97d66d9c14
# Parent  36892782f26a796a6f48bc39757b3eb914ff4e06
(frame-notice-user-settings): Don't add a
tool-bar-lines frame parameter to default-frame-alist in batch
mode.

diff -r 36892782f26a -r b54fba72959b lisp/frame.el
--- 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)))