Merge from trunk.

1 files changed, 14 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 7f9aeffa5c6..55a1ded7099 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -247,7 +247,14 @@ You can pick the name of the function and the variables with `C-x 4 a'.
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
-** The backtrace debugger can display local vars with `v'.
+** CUA-mode
+CUA-mode was changed to make use of delete-selection-mode and
+shift-select-mode.  So you can now enable it independently from
+transient-mark-mode, delete-selection-mode, and shift-select-mode.
+As a result, cua-highlight-region-shift-only is obsolete
+(you can disable transient-mark-mode to get the same result).
+
+** `delete-selection-mode' can be used without transient-mark-mode.
 
 ** prolog-use-smie has been removed, along with the non-SMIE indentation code.
 
@@ -257,10 +264,6 @@ file and letting SMIE learn from it.
 
 ** sh-script now uses its SMIE indentation algorithm by default.
 
-** The debugger's `e' command evaluates the code in the context at point.
-This includes using the lexical environment at point, which means that
-`e' now lets you access lexical variables as well.
-
 ** `eshell' now supports visual subcommands and options
 Eshell has been able to handle "visual" commands (interactive,
 non-line oriented commands such as top that require display
@@ -318,6 +321,12 @@ Use `electric-indent-mode' instead.
 ** completing-read-multiple's separator can now be a regexp.
 The default separator is changed to allow surrounding spaces around the comma.
 
+** The backtrace debugger and local variables:
+*** The debugger's `e' command evaluates the code in the context at point.
+This includes using the lexical environment at point, which means that
+`e' now lets you access lexical variables as well.
+*** The backtrace debugger can display local vars with `v'.
+
 ** Battery
 
 *** Battery information via the BSD `apm' utility is now supported.