[Emacs-diffs] /srv/bzr/emacs/trunk r102716: Fix 2010-12-20 change to tool-bar.el.

[Chong Yidong]

------------------------------------------------------------
revno: 102716
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-12-28 17:39:25 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/tool-bar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-27 17:52:17 +0000
+++ b/lisp/ChangeLog    2010-12-28 09:39:25 +0000
@@ -1,3 +1,9 @@
+2010-12-28  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/secrets.el (secrets-delete-alias): New defun.

=== modified file 'lisp/tool-bar.el'
--- a/lisp/tool-bar.el  2010-12-20 00:17:26 +0000
+++ b/lisp/tool-bar.el  2010-12-28 09:39:25 +0000
@@ -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")