* toolbar/tool-bar.el (tool-bar-setup): Use lookup-key for

  cut/copy/paste in case menu-bar-enable-clipboard is in effect.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3a9555..207abb2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2004-05-03  Jan D.  <jhd@gaffa.localdomain>
+2004-05-03  Jan Dj\e,Ad\e(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\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * term/x-win.el (x-clipboard-yank): Don't exit on error from
        x-get-selection.

diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index 425789e..6b890e5 100644 (file)
--- 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."
   (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")