# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1292856268 -28800
# Node ID dc2134428db304b6e10688b091462a5fa3d47002
# Parent  b476e8175f20784abe2f79a5a5f23375064dcd21
Bind "Copy" menu item to kill-ring-save, obsoleting menu-bar-kill-ring-save.

* menu-bar.el (menu-bar-kill-ring-save): Make obsolete.
(menu-bar-edit-menu): Bind "Copy" to kill-ring-save.  Don't use
mouse-region-match.

diff -r b476e8175f20 -r dc2134428db3 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 20 19:11:30 2010 +0800
+++ b/lisp/ChangeLog	Mon Dec 20 22:44:28 2010 +0800
@@ -1,9 +1,11 @@
 2010-12-20  Chong Yidong  <cyd@stupidchicken.com>
 
+	* menu-bar.el (menu-bar-kill-ring-save): Make obsolete.
+	(menu-bar-edit-menu): Bind "Copy" to kill-ring-save.  Don't use
+	mouse-region-match.
+
 	* color.el: Move from gnus/.
 
-2010-12-20  Chong Yidong  <cyd@stupidchicken.com>
-
 	* vc/diff.el (diff-better-file-name): Function deleted.
 	abbreviating file names causes problems with shell-quote-argument.
 	(diff-no-select): Just use expand-file-name.
diff -r b476e8175f20 -r dc2134428db3 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Mon Dec 20 19:11:30 2010 +0800
+++ b/lisp/menu-bar.el	Mon Dec 20 22:44:28 2010 +0800
@@ -479,8 +479,7 @@
 (define-key menu-bar-edit-menu [clear]
   `(menu-item ,(purecopy "Clear") delete-region
 	      :enable (and mark-active
-			   (not buffer-read-only)
-			   (not (mouse-region-match)))
+			   (not buffer-read-only))
 	      :help
 	      ,(purecopy "Delete the text in region between mark and current position")))
 (defvar yank-menu (cons (purecopy "Select Yank") nil))
@@ -510,7 +509,7 @@
   ;; under X (for GNUstep).
   `(menu-item ,(purecopy "Copy") ,(if (featurep 'ns)
                                       'ns-copy-including-secondary
-                                    'menu-bar-kill-ring-save)
+                                    'kill-ring-save)
               :enable mark-active
               :help ,(purecopy "Copy text in region between mark and current position")
               :keys ,(purecopy (if (featurep 'ns)
@@ -534,11 +533,8 @@
 			     (consp buffer-undo-list)))
 	      :help ,(purecopy "Undo last operation")))
 
-(defun menu-bar-kill-ring-save (beg end)
-  (interactive "r")
-  (if (mouse-region-match)
-      (message "Selecting a region with the mouse does `copy' automatically")
-    (kill-ring-save beg end)))
+(define-obsolete-function-alias
+  'menu-bar-kill-ring-save 'kill-ring-save "24.1")
 
 ;; These are alternative definitions for the cut, paste and copy
 ;; menu items.  Use them if your system expects these to use the clipboard.