# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1293529165 -28800
# Node ID 41f10e4816d0382659bcfa2f00b79b272df56248
# Parent  68a3b6b312ee7d86962a9687b9fe7d16d84731bd
Fix 2010-12-20 change to tool-bar.el.

* tool-bar.el (tool-bar-setup): Remove :enable conditions, which
are handled by the menu-bar entries.  As before, don't use
:visibile to avoid changing the tool-bar.

diff -r 68a3b6b312ee -r 41f10e4816d0 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 27 18:52:17 2010 +0100
+++ b/lisp/ChangeLog	Tue Dec 28 17:39:25 2010 +0800
@@ -1,3 +1,9 @@
+2010-12-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* tool-bar.el (tool-bar-setup): Remove :enable conditions, which
+	are handled by the menu-bar entries.  As before, don't use
+	:visibile to avoid changing the tool-bar.
+
 2010-12-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/secrets.el (secrets-delete-alias): New defun.
diff -r 68a3b6b312ee -r 41f10e4816d0 lisp/tool-bar.el
--- a/lisp/tool-bar.el	Mon Dec 27 18:52:17 2010 +0100
+++ b/lisp/tool-bar.el	Tue Dec 28 17:39:25 2010 +0800
@@ -252,26 +252,16 @@
   (tool-bar-add-item-from-menu 'dired "diropen" nil :vert-only t)
   (tool-bar-add-item-from-menu 'kill-this-buffer "close" nil :vert-only t)
   (tool-bar-add-item-from-menu 'save-buffer "save" nil
-			       :label "Save"
-			       :enable '(or buffer-file-name
-					     (not (eq 'special
-						      (get major-mode
-							   'mode-class)))))
+			       :label "Save")
   (define-key-after (default-value 'tool-bar-map) [separator-1] menu-bar-separator)
-  (tool-bar-add-item-from-menu 'undo "undo" nil :vert-only t
-			       :enable '(not (eq 'special (get major-mode
-								'mode-class))))
+  (tool-bar-add-item-from-menu 'undo "undo" nil :vert-only t)
   (define-key-after (default-value 'tool-bar-map) [separator-2] menu-bar-separator)
   (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut])
-			       "cut" nil :vert-only t
-			       :enable '(not (eq 'special (get major-mode
-								'mode-class))))
+			       "cut" nil :vert-only t)
   (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy])
 			       "copy" nil :vert-only t)
   (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste])
-			       "paste" nil :vert-only t
-			       :enable '(not (eq 'special (get major-mode
-								'mode-class))))
+			       "paste" nil :vert-only t)
   (define-key-after (default-value 'tool-bar-map) [separator-3] menu-bar-separator)
   (tool-bar-add-item-from-menu 'nonincremental-search-forward "search"
 			       nil :label "Search")