# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1083620901 0
# Node ID 6dd3315d02d410541aacde9b663723d96495adf1
# Parent  f2f742f020fbfc9fc0f9c5fec227150ea9c3611b
* toolbar/tool-bar.el (tool-bar-setup): Use lookup-key for
  cut/copy/paste in case menu-bar-enable-clipboard is in effect.

diff -r f2f742f020fb -r 6dd3315d02d4 lisp/ChangeLog
--- 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.
diff -r f2f742f020fb -r 6dd3315d02d4 lisp/toolbar/tool-bar.el
--- 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")