summaryrefslogtreecommitdiff
path: root/lisp/tool-bar.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-12-28 17:39:25 +0800
committerChong Yidong <cyd@stupidchicken.com>2010-12-28 17:39:25 +0800
commitc940c05468b5ab2a203bd8043f0d4f4f3bf56958 (patch)
treebede8ca9491891c36111e0028ac801d7e90b5f46 /lisp/tool-bar.el
parent4c145d5d06aff906d311f95bff3ccc2cb424580a (diff)
downloademacs-c940c05468b5ab2a203bd8043f0d4f4f3bf56958.tar.gz
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.
Diffstat (limited to 'lisp/tool-bar.el')
-rw-r--r--lisp/tool-bar.el18
1 files changed, 4 insertions, 14 deletions
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index e819cbe99a8..fa16381bf29 100644
--- 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")