Edit NEWS entries about selection changes.

1 files changed, 42 insertions, 48 deletions

diff --git a/etc/NEWS b/etc/NEWS
index da9f1aa3ac1..07cb55dc09a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -269,54 +269,48 @@ should use delete-char with a negative argument instead.
 
 ** Selection changes.
 
-The default handling of clipboard and primary selections has been
-changed to conform with other X applications.  The exact changes are
-described below; in short, mouse commands to select and paste text now
-use the primary selection, while all other commands for killing and
-yanking text now use the clipboard.
-
-*** Merely selecting text (e.g. with drag-mouse-1) does not add it to
-the kill-ring.  On systems with a primary selection separate from the
-clipboard (such as X), the selected text is put in the primary
-selection.
-
-*** mouse-2 is now bound to `mouse-yank-primary', which pastes from
-the primary selection regardless of the contents of the kill-ring.
-
-*** Commands that kill text or copy it to the kill-ring (M-w, C-w,
-C-k, etc.) also put the killed text into the clipboard.  This change
-also means that the "Copy", "Cut", and "Paste" items in the "Edit"
-menu are now exactly equivalent to, respectively M-w, C-w, and C-y.
-
-*** Yank commands, such as C-y and M-y, retrieve text from the
-clipboard if it is available.
-
-*** The above changes are reflected in the following new defaults:
-
-**** `select-active-regions' now defaults to t.
-It also accepts a new value, `only', which means to only set the
-primary selection for temporarily active regions (usually made by
-mouse-dragging or shift-selection).
-
-**** `mouse-2' is now bound to `mouse-yank-primary'.
-Previously, it was bound to `mouse-yank-at-click' (which is now
-unbound by default).
-
-**** `x-select-enable-clipboard' now defaults to t on all platforms.
-Note that this variable was already non-nil by default on MS-Windows,
-which does not support the primary selection between applications.
-
-**** `x-select-enable-primary' now defaults to nil.
-This variable exists only on X; its default value was t in previous
-versions.
-
-**** `mouse-drag-copy-region' now defaults to nil.
-
-*** To return to the previous behavior, where mouse commands use the
-clipboard, change `mouse-drag-copy-region' and (on X only)
-`x-select-enable-primary' to t.  If you don't want Emacs to put the
-text into the clipboard, only to the primary selection, additionally
-set `x-select-enable-clipboard' to nil.
+The default handling of clipboard and primary selections was changed
+to conform with modern X applications.  In short, most commands for
+killing and yanking text now use the clipboard, while mouse commands
+use the primary selection.
+
+In the following, we provide a list of these changes, followed by a
+list of steps to get the old behavior back if you prefer that.
+
+*** `mouse-drag-copy-region' now defaults to nil.
+*** `select-active-regions' now defaults to t.
+Merely selecting text (e.g. with drag-mouse-1) no longer puts it in
+the kill-ring.  The selected text is put in the primary selection, if
+the system possesses a separate primary selection facility (e.g. X).
+
+**** `select-active-regions' also accepts a new value, `only'.
+This means to only set the primary selection for temporarily active
+regions (usually made by mouse-dragging or shift-selection);
+"ordinary" active regions, such as those made with C-SPC followed by
+point motion, do not alter the primary selection.
+
+*** mouse-2 is now bound to `mouse-yank-primary'.
+This pastes from the primary selection, ignoring the kill-ring.
+Previously, mouse-2 was bound to `mouse-yank-at-click'.
+
+*** `x-select-enable-clipboard' now defaults to t on all platforms.
+*** `x-select-enable-primary' now defaults to nil.
+Thus, commands that kill text or copy it to the kill-ring (such as
+M-w, C-w, and C-k) also use the clipboard---not the primary selection.
+
+**** The "Copy", "Cut", and "Paste" items in the "Edit" menu are now
+exactly equivalent to, respectively M-w, C-w, and C-y.
+
+**** Note that on MS-Windows, `x-select-enable-clipboard' was already
+non-nil by default, as Windows does not support the primary selection
+between applications.
+
+*** To return to the previous behavior, do the following:
+
+**** Change `mouse-drag-copy-region' to t.
+**** Change `x-select-enable-primary' to t (on X only).
+**** Change `x-select-enable-clipboard' to nil.
+**** Bind `mouse-yank-at-click' to mouse-2.
 
 *** Support for X cut buffers has been removed.