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.
This commit is contained in:
Chong Yidong 2010-12-28 17:39:25 +08:00
parent 4c145d5d06
commit c940c05468
2 changed files with 10 additions and 14 deletions

View file

@ -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.

View file

@ -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")