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.

diff --git a/etc/NEWS b/etc/NEWS
index 27865cce51a0cfe2ecabc408daeefdf2455026bc..bf60bcb31aaf4a3eec6ee4746b19912b56ee69d6 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -183,6 +183,8 @@ and yank use the clipboard, in addition to the primary selection.
 
 *** `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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0ea29a5d891455c2a02c873a604310968ada40b..fe0c28dfd9a2bfa3804ee20ff13638325d3cc853 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index b159add0d910948a8bbcd835a510c6e9f830756a..39c6993d973085f162222258971d9a0e8aaa5733 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -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

diff --git a/lisp/simple.el b/lisp/simple.el
index 939fbfe4e156abe888ef8730a0791ab626d48299..10b8ab67ebcb3d18c2240ceba65fe017361fa255 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3670,7 +3670,7 @@ a mistake; see the documentation of `set-mark'."
   "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))
 

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index b3ce877be59762cc77295bf444d43a1abe9e7fa0..213f7f5230ba7e3ef944911fe3cacad5de49033d 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1223,12 +1223,14 @@ It is said that overlarge strings are slow to put into the cut buffer.")
   "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.