Mercurial > emacs
changeset 112025:41f10e4816d0
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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 28 Dec 2010 17:39:25 +0800 |
| parents | 68a3b6b312ee |
| children | b3df357e51ff |
| files | lisp/ChangeLog lisp/tool-bar.el |
| diffstat | 2 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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")