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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4023ba55cd4d50154ae53a5d25bcebb416d168b..c0ec2bb8ae16c85b862689ba72a0d99828f37276 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index e819cbe99a8655bf28c1ce40cb1e8090cc4549f6..fa16381bf29d3ce04755fc78558d6eba0dd1a886 100644 (file)
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -252,26 +252,16 @@ holds a keymap."
   (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")