# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969969121 0
# Node ID ce212cd0463fba8931835701d95c5534e2a7e9d3
# Parent  a73424672d42bdfc29b73befb75ef8a38ff17a37
(frame-notice-user-settings): Make tool-bar-mode and
default-frame-alist consistent.

diff -r a73424672d42 -r ce212cd0463f lisp/frame.el
--- a/lisp/frame.el	Tue Sep 26 11:12:19 2000 +0000
+++ b/lisp/frame.el	Tue Sep 26 11:52:01 2000 +0000
@@ -221,13 +221,22 @@
   "Act on user's init file settings of frame parameters.
 React to settings of `default-frame-alist', `initial-frame-alist' there."
   ;; Make menu-bar-mode and default-frame-alist consistent.
-  (if (boundp 'menu-bar-mode)
-      (let ((default (assq 'menu-bar-lines default-frame-alist)))
-	(if default
-	    (setq menu-bar-mode (not (eq (cdr default) 0)))
-	  (setq default-frame-alist
-		(cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
-		      default-frame-alist)))))
+  (when (boundp 'menu-bar-mode)
+    (let ((default (assq 'menu-bar-lines default-frame-alist)))
+      (if default
+	  (setq menu-bar-mode (not (eq (cdr default) 0)))
+	(setq default-frame-alist
+	      (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)
+    (let ((default (assq 'tool-bar-lines default-frame-alist)))
+      (if default
+	  (setq tool-bar-mode (not (eq (cdr default) 0)))
+	(setq default-frame-alist
+	      (cons (cons 'tool-bar-lines (if tool-bar-mode 1 0))
+		    default-frame-alist)))))
 
   ;; Creating and deleting frames may shift the selected frame around,
   ;; and thus the current buffer.  Protect against that.  We don't