Mercurial > emacs
changeset 55345:6dd3315d02d4
* toolbar/tool-bar.el (tool-bar-setup): Use lookup-key for
cut/copy/paste in case menu-bar-enable-clipboard is in effect.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 03 May 2004 21:48:21 +0000 |
| parents | f2f742f020fb |
| children | db73f720cd94 |
| files | lisp/ChangeLog lisp/toolbar/tool-bar.el |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon May 03 21:46:00 2004 +0000 +++ b/lisp/ChangeLog Mon May 03 21:48:21 2004 +0000 @@ -1,4 +1,9 @@ -2004-05-03 Jan D. <jhd@gaffa.localdomain> +2004-05-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * toolbar/tool-bar.el (tool-bar-setup): Use lookup-key for + cut/copy/paste in case menu-bar-enable-clipboard is in effect. + +2004-05-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * term/x-win.el (x-clipboard-yank): Don't exit on error from x-get-selection.
--- a/lisp/toolbar/tool-bar.el Mon May 03 21:46:00 2004 +0000 +++ b/lisp/toolbar/tool-bar.el Mon May 03 21:48:21 2004 +0000 @@ -239,11 +239,14 @@ (tool-bar-add-item-from-menu 'undo "undo" nil :visible '(not (eq 'special (get major-mode 'mode-class)))) - (tool-bar-add-item-from-menu 'kill-region "cut" nil + (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut]) + "cut" nil :visible '(not (eq 'special (get major-mode 'mode-class)))) - (tool-bar-add-item-from-menu 'menu-bar-kill-ring-save "copy") - (tool-bar-add-item-from-menu 'yank "paste" nil + (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy]) + "copy") + (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste]) + "paste" nil :visible '(not (eq 'special (get major-mode 'mode-class)))) (tool-bar-add-item-from-menu 'nonincremental-search-forward "search")