diff options
| author | Jan Djärv | 2004-05-03 21:48:21 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-05-03 21:48:21 +0000 |
| commit | 0928a1d8258b49e371342234bc43f5005ff410bf (patch) | |
| tree | 0e3f0c4dc7968d9d02e0c707608c910b9f7d9203 | |
| parent | b36ee2a6ec604eb6a6c65d8c10c4ca1ad477c60e (diff) | |
| download | emacs-0928a1d8258b49e371342234bc43f5005ff410bf.tar.gz emacs-0928a1d8258b49e371342234bc43f5005ff410bf.zip | |
* toolbar/tool-bar.el (tool-bar-setup): Use lookup-key for
cut/copy/paste in case menu-bar-enable-clipboard is in effect.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/toolbar/tool-bar.el | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3a9555d10b..207abb2cd40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | 2004-05-03 Jan D. <jhd@gaffa.localdomain> | 1 | 2004-05-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | |||
| 3 | * toolbar/tool-bar.el (tool-bar-setup): Use lookup-key for | ||
| 4 | cut/copy/paste in case menu-bar-enable-clipboard is in effect. | ||
| 5 | |||
| 6 | 2004-05-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | 7 | ||
| 3 | * term/x-win.el (x-clipboard-yank): Don't exit on error from | 8 | * term/x-win.el (x-clipboard-yank): Don't exit on error from |
| 4 | x-get-selection. | 9 | x-get-selection. |
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el index 425789eb80e..6b890e5078f 100644 --- a/lisp/toolbar/tool-bar.el +++ b/lisp/toolbar/tool-bar.el | |||
| @@ -239,11 +239,14 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap." | |||
| 239 | (tool-bar-add-item-from-menu 'undo "undo" nil | 239 | (tool-bar-add-item-from-menu 'undo "undo" nil |
| 240 | :visible '(not (eq 'special (get major-mode | 240 | :visible '(not (eq 'special (get major-mode |
| 241 | 'mode-class)))) | 241 | 'mode-class)))) |
| 242 | (tool-bar-add-item-from-menu 'kill-region "cut" nil | 242 | (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut]) |
| 243 | "cut" nil | ||
| 243 | :visible '(not (eq 'special (get major-mode | 244 | :visible '(not (eq 'special (get major-mode |
| 244 | 'mode-class)))) | 245 | 'mode-class)))) |
| 245 | (tool-bar-add-item-from-menu 'menu-bar-kill-ring-save "copy") | 246 | (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy]) |
| 246 | (tool-bar-add-item-from-menu 'yank "paste" nil | 247 | "copy") |
| 248 | (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste]) | ||
| 249 | "paste" nil | ||
| 247 | :visible '(not (eq 'special (get major-mode | 250 | :visible '(not (eq 'special (get major-mode |
| 248 | 'mode-class)))) | 251 | 'mode-class)))) |
| 249 | (tool-bar-add-item-from-menu 'nonincremental-search-forward "search") | 252 | (tool-bar-add-item-from-menu 'nonincremental-search-forward "search") |