summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/menu-bar.el12
2 files changed, 8 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98a0a943858..510bfcdd2c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,10 @@
2010-12-20 Chong Yidong <cyd@stupidchicken.com>
- * color.el: Move from gnus/.
+ * 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.
-2010-12-20 Chong Yidong <cyd@stupidchicken.com>
+ * color.el: Move from gnus/.
* vc/diff.el (diff-better-file-name): Function deleted.
abbreviating file names causes problems with shell-quote-argument.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 989bdcff821..7babd41b69d 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -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.