Commit 42d9cffa authored by Chong Yidong's avatar Chong Yidong
Browse files

etc/NEWS: Remove VC changes, since they are backported to 23.3.

Edit selection changes.
parent 693c9d15
...@@ -187,7 +187,7 @@ for `list-colors-display'. ...@@ -187,7 +187,7 @@ for `list-colors-display'.
** An Emacs Lisp package manager is now included. ** An Emacs Lisp package manager is now included.
This is a convenient way to download and install additional packages, This is a convenient way to download and install additional packages,
from elpa.gnu.org. from a package repository at elpa.gnu.org.
*** `M-x list-packages' shows a list of packages, which can be *** `M-x list-packages' shows a list of packages, which can be
selected for installation. selected for installation.
...@@ -227,8 +227,8 @@ and no prefix argument is given. If set to `kill', these commands ...@@ -227,8 +227,8 @@ and no prefix argument is given. If set to `kill', these commands
kill instead. kill instead.
*** New command `delete-forward-char', bound to C-d and [delete]. *** New command `delete-forward-char', bound to C-d and [delete].
This is meant for interactive use, and obeys `delete-active-region'; This is meant for interactive use, and obeys `delete-active-region'.
delete-char, meant for Lisp, does not obey `delete-active-region'. The command `delete-char' does not obey `delete-active-region'.
*** `delete-backward-char' is now a Lisp function. *** `delete-backward-char' is now a Lisp function.
Apart from obeying `delete-active-region', its behavior is unchanged. Apart from obeying `delete-active-region', its behavior is unchanged.
...@@ -240,65 +240,53 @@ should use delete-char with a negative argument instead. ...@@ -240,65 +240,53 @@ should use delete-char with a negative argument instead.
** Selection changes. ** Selection changes.
The default handling of clipboard and primary selections has been The default handling of clipboard and primary selections has been
changed to conform with other X applications. changed to conform with other X applications. The exact changes are
described below; in short, mouse commands to select and paste text now
The new behavior is that by default Emacs does not put selected text use the primary selection, while all other commands for killing and
into the clipboard, and does not add it to kill-ring, merely because yanking text now use the clipboard.
the text was selected. Only commands that kill text or copy it to the
kill-ring (C-w, M-w, C-k, etc.) put the killed text into the
clipboard. Selected text is put into the primary selection (on
systems, such as X, that support the primary selection separately from
the clipboard).
Similarly, Emacs by default does not retrieve text from the clipboard
when the mouse (e.g., mouse-2) is used for pasting text selected in
another application. Mouse commands that paste text retrieve text
from the primary selection, on systems that support it separately from
the clipboard. Text from the clipboard is retrieved only by C-y, M-y
and other commands that yank text from the kill-ring.
In other words, the default behavior is that mouse gestures that
select and paste text work with the primary selection (on X), while
keyboard commands that kill/copy and paste text work with the
clipboard.
This change also means that the "Copy", "Cut", and "Paste" items of
the menu-bar "Edit" menu are now exactly equivalent to, respectively
M-w, C-w, and C-y.
To get back the previous behavior, whereby mouse gestures set the
clipboard and retrieve text from there, customize the variables
`mouse-drag-copy-region' and (on X only) `x-select-enable-primary' to
non-nil values. If you don't want Emacs to put the text into the
clipboard, only to the primary selection, additionally customize
`x-select-enable-clipboard' to nil.
These changes in the default behavior are reflected in the default
values of several variables:
*** `select-active-regions' now defaults to t, so active regions set
the primary selection. It was nil in previous versions.
*** 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 It also accepts a new value, `only', which means to only set the
primary selection for temporarily active regions (usually made by primary selection for temporarily active regions (usually made by
mouse-dragging or shift-selection). mouse-dragging or shift-selection).
*** `mouse-2' is now bound to `mouse-yank-primary'. **** `mouse-2' is now bound to `mouse-yank-primary'.
Previously, it was bound to `mouse-yank-at-click' (which is now Previously, it was bound to `mouse-yank-at-click' (which is now
unbound by default). unbound by default).
*** `x-select-enable-clipboard' now defaults to t on all platforms. **** `x-select-enable-clipboard' now defaults to t on all platforms.
Thus, killing and yanking now use the clipboard (in addition to the Note that this variable was already non-nil by default on MS-Windows,
kill ring). Note that this variable was already non-nil by default on which does not support the primary selection between applications.
MS-Windows, which does not support the primary selection between
applications.
*** `x-select-enable-primary' now defaults to nil. **** `x-select-enable-primary' now defaults to nil.
This variable exists only on X; its default value was t in previous This variable exists only on X; its default value was t in previous
versions. versions.
*** `mouse-drag-copy-region' now defaults to nil. **** `mouse-drag-copy-region' now defaults to nil.
Its previous default value was t.
*** 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.
*** Support for X cut buffers has been removed. *** Support for X cut buffers has been removed.
...@@ -350,7 +338,7 @@ view-diary-entries, list-diary-entries, show-all-diary-entries ...@@ -350,7 +338,7 @@ view-diary-entries, list-diary-entries, show-all-diary-entries
*** Customize buffers now contain a search field. *** Customize buffers now contain a search field.
The search is performed using `customize-apropos'. The search is performed using `customize-apropos'.
To turn off the search field, set custom-search-field to nil . To turn off the search field, set custom-search-field to nil.
*** Custom options now start out hidden if at their default values. *** Custom options now start out hidden if at their default values.
Use the arrow to the left of the option name to toggle visibility. Use the arrow to the left of the option name to toggle visibility.
...@@ -365,41 +353,6 @@ choose a color via list-colors-display. ...@@ -365,41 +353,6 @@ choose a color via list-colors-display.
*** dired-jump and dired-jump-other-window called with a prefix argument *** dired-jump and dired-jump-other-window called with a prefix argument
read a file name from the minibuffer instead of using buffer-file-name. read a file name from the minibuffer instead of using buffer-file-name.
** VC and related modes
*** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file.
**** vc-log-incoming for Git runs "git fetch" so that the necessary
data is available locally.
**** vc-log-incoming and vc-log-outgoing for Git require version 1.7 (or newer).
*** New key bindings: C-x v I and C-x v O bound to vc-log-incoming and
vc-log-outgoing, respectively.
*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
reruns the corresponding VC command to compute an up to date version
of the buffer.
*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
*** Special markup can be added to log-edit buffers.
The log-edit buffers are expected to have a format similar to email messages
with headers of the form:
Author: <author of this change>
Summary: <one line summary of this change>
Fixes: <reference to the bug fixed by this change>
Some backends handle some of those headers specially, but any unknown header
is just left as is in the message, so it is not lost.
**** vc-git handles Author: and Date:
**** vc-hg handles Author: and Date:
**** vc-bzr handles Author:, Date: and Fixes:
**** vc-mtn handles Author: and Date:
*** Pressing g in a *vc-diff* buffer reruns vc-diff, so it will
produce an up to date diff.
** Directory local variables can apply to file-less buffers. ** Directory local variables can apply to file-less buffers.
For example, adding "(diff-mode . ((mode . whitespace)))" to your For example, adding "(diff-mode . ((mode . whitespace)))" to your
.dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers. .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment