# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 971089892 0
# Node ID d1c0cf83e36569903bac0f8724717020f314f038
# Parent  7980c067a12bc44cac908737cc29ea1eaa280c16
(tool-bar-mode): Check whether tool-bar-map
has been initialized before calling tool-bar-setup.

diff -r 7980c067a12b -r d1c0cf83e365 lisp/toolbar/tool-bar.el
--- a/lisp/toolbar/tool-bar.el	Mon Oct 09 10:28:16 2000 +0000
+++ b/lisp/toolbar/tool-bar.el	Mon Oct 09 11:11:32 2000 +0000
@@ -36,6 +36,8 @@
 ;; global bar in modes which have `special' as their `mode-class'
 ;; properlty.)
 
+;; Todo: Somehow make tool bars easily customizable by the naive?
+
 ;;; Code:
 
 ;;;###autoload
@@ -60,7 +62,9 @@
       (if elt
 	  (setcdr elt lines)
 	(add-to-list 'default-frame-alist (cons 'tool-bar-lines lines)))))
-  (if (and tool-bar-mode (display-graphic-p))
+  (if (and tool-bar-mode
+	   (display-graphic-p)
+	   (= 1 (length (default-value 'tool-bar-map)))) ; not yet setup
       (tool-bar-setup)))
 
 (defvar tool-bar-map (make-sparse-keymap)