From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 21 Sep 2000 18:38:53 +0000 (+0000)
Subject: (command-line): If frame was created with a non-zero
X-Git-Tag: emacs-pretest-21.0.90~1440
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d1eb6a4c09b9ca535e19aae43a221ee8916bbad;p=emacs.git

(command-line): If frame was created with a non-zero
tool-bar-lines parameter, switch tool-bar-mode on.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index c1344f6f7b9..3353330a198 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -652,6 +652,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 	       (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0)))
       (menu-bar-mode t))
 
+  ;; If frame was created with a tool bar, switch tool-bar-mode on.
+  (when (and (not noninteractive)
+	     (memq window-system '(x w32))
+	     (> (frame-parameter nil 'tool-bar-lines) 0))
+    (tool-bar-mode t))
+
   ;; Can't do this init in defcustom because window-system isn't set.
   (when (and (not noninteractive)
 	     (not (eq system-type 'ms-dos))