diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/mouse.el | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 2 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 8 |
4 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0ea29a5d89..fe0c28dfd9a 100644 --- 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 b159add0d91..39c6993d973 100644 --- 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 939fbfe4e15..10b8ab67ebc 100644 --- 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 b3ce877be59..213f7f5230b 100644 --- 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. |