[Emacs-diffs] /srv/bzr/emacs/trunk r100834: Change x-select-enable-primary to nil.

[Chong Yidong]

------------------------------------------------------------
revno: 100834
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-16 22:49:48 -0400
message:
  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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/mouse.el
  lisp/simple.el
  lisp/term/x-win.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-07-14 18:03:39 +0000
+++ b/etc/NEWS  2010-07-17 02:49:48 +0000
@@ -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'.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-16 15:42:15 +0000
+++ b/lisp/ChangeLog    2010-07-17 02:49:48 +0000
@@ -1,3 +1,11 @@
+2010-07-17  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vc.el (vc-coding-system-inherit-eol): New defvar.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2010-07-14 18:03:39 +0000
+++ b/lisp/mouse.el     2010-07-17 02:49:48 +0000
@@ -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

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2010-07-16 15:42:15 +0000
+++ b/lisp/simple.el    2010-07-17 02:49:48 +0000
@@ -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))
 

=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el        2010-07-14 18:03:39 +0000
+++ b/lisp/term/x-win.el        2010-07-17 02:49:48 +0000
@@ -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.