Mercurial > emacs
changeset 109448:334eb7871775
Change x-select-enable-primary to nil.
* lisp/mouse.el (mouse-drag-copy-region):
* lisp/simple.el (select-active-regions): Likewise.
* lisp/term/x-win.el (x-select-enable-primary): Change default to nil.
(x-select-enable-clipboard): Add :version keyword.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 16 Jul 2010 22:49:48 -0400 |
| parents | f0c7ada3b642 |
| children | 333d4b14e6cb |
| files | etc/NEWS lisp/ChangeLog lisp/mouse.el lisp/simple.el lisp/term/x-win.el |
| diffstat | 5 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Sat Jul 17 01:42:11 2010 +0200 +++ b/etc/NEWS Fri Jul 16 22:49:48 2010 -0400 @@ -183,6 +183,8 @@ *** `x-select-enable-clipboard' now defaults to t. +*** `x-select-enable-primary' now defaults to nil. + *** `mouse-drag-copy-region' now defaults to nil. *** `mouse-2' is now bound to `mouse-yank-primary'.
--- a/lisp/ChangeLog Sat Jul 17 01:42:11 2010 +0200 +++ b/lisp/ChangeLog Fri Jul 16 22:49:48 2010 -0400 @@ -1,3 +1,11 @@ +2010-07-17 Chong Yidong <cyd@stupidchicken.com> + + * term/x-win.el (x-select-enable-primary): Change default to nil. + (x-select-enable-clipboard): Add :version keyword. + + * mouse.el (mouse-drag-copy-region): + * simple.el (select-active-regions): Likewise. + 2010-07-16 Reiner Steib <Reiner.Steib@gmx.de> * vc.el (vc-coding-system-inherit-eol): New defvar.
--- a/lisp/mouse.el Sat Jul 17 01:42:11 2010 +0200 +++ b/lisp/mouse.el Fri Jul 16 22:49:48 2010 -0400 @@ -44,7 +44,7 @@ (defcustom mouse-drag-copy-region nil "If non-nil, mouse drag copies region to kill-ring." :type 'boolean - :version "22.1" + :version "24.1" :group 'mouse) (defcustom mouse-1-click-follows-link 450
--- a/lisp/simple.el Sat Jul 17 01:42:11 2010 +0200 +++ b/lisp/simple.el Fri Jul 16 22:49:48 2010 -0400 @@ -3670,7 +3670,7 @@ "If non-nil, an active region automatically becomes the window selection." :type 'boolean :group 'killing - :version "23.1") + :version "24.1") (declare-function x-selection-owner-p "xselect.c" (&optional selection))
--- a/lisp/term/x-win.el Sat Jul 17 01:42:11 2010 +0200 +++ b/lisp/term/x-win.el Fri Jul 16 22:49:48 2010 -0400 @@ -1223,12 +1223,14 @@ "Non-nil means cutting and pasting uses the clipboard. This is in addition to, but in preference to, the primary selection." :type 'boolean - :group 'killing) + :group 'killing + :version "24.1") -(defcustom x-select-enable-primary t +(defcustom x-select-enable-primary nil "Non-nil means cutting and pasting uses the primary selection." :type 'boolean - :group 'killing) + :group 'killing + :version "24.1") (defun x-select-text (text &optional push) "Select TEXT, a string, according to the window system.