2002-02-21 Per Abrahamsen <abraham@dina.kvl.dk>

      * toolbar/tool-bar.el (tool-bar-mode): Revert the :init-value to
      nil, and then explicitly set the standard-value to t.

2 files changed, 17 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fe2962690e..e6da0471a35 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-21  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+        * toolbar/tool-bar.el (tool-bar-mode): Revert the :init-value to
+        nil, and then explicitly set the standard-value to t.
+
 2002-02-20  Sam Steingold  <sds@gnu.org>
 
         * textmodes/flyspell.el (flyspell-mode): Autoload the variable
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index 5f563be810a..e1dd537ad6b 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -47,7 +47,7 @@ With numeric ARG, display the tool bar if and only if ARG is positive.
 
 See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for
 conveniently adding tool bar items."
-  :init-value t
+  :init-value nil
   :global t
   :group 'mouse
   :group 'frames
@@ -68,6 +68,17 @@ conveniently adding tool bar items."
                 (= 1 (length (default-value 'tool-bar-map)))) ; not yet setup
            (tool-bar-setup))))
 
+;;;###autoload
+;; We want to pretend the toolbar by standard is on, as this will make
+;; customize consider disabling the toolbar a customization, and save
+;; that.  We could do this for real by setting :init-value above, but
+;; that would turn on the toolbar in MS Windows where it is currently
+;; useless, and it would overwrite disabling the tool bar from X
+;; resources.  If anyone want to implement this in a cleaner way,
+;; please do so.
+;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-21.
+(put 'tool-bar-mode 'standard-value '(t))
+
 (defvar tool-bar-map (make-sparse-keymap)
   "Keymap for the tool bar.
 Define this locally to override the global tool bar.")