5 files changed, 28 insertions, 14 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0e919e97b9b..e2947083ba1 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * programs.texi (Matching): Fix typo.
+
+        * killing.texi (CUA Bindings): Document the new relationship between
+        cua-mode and delete-selection mode.
+        (CUA Bindings): Mention that rectangle mode can be used on its own.
+
 2014-02-14  Glenn Morris  <rgm@gnu.org>
 
         * regs.texi (Configuration Registers): Update C-x r f binding.
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 77dfad04bef..1826c668aa5 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -866,8 +866,9 @@ the prefix key twice, e.g., @kbd{C-x C-x C-f}.
 while retaining the other features of CUA mode described below, set
 the variable @code{cua-enable-cua-keys} to @code{nil}.
 
-  In CUA mode, typed text replaces the active region as in
-Delete-Selection mode (@pxref{Mouse Commands}).
+  CUA mode by default activates Delete-Selection mode (@pxref{Mouse Commands})
+so that typed text replaces the active region.  To use CUA without this
+behavior, set the variable @code{cua-delete-selection} to @code{nil}.
 
 @cindex rectangle highlighting
   CUA mode provides enhanced rectangle support with visible
@@ -878,6 +879,9 @@ extend it using the movement commands, and cut or copy it using
 any direction.  Normal text you type is inserted to the left or right
 of each line in the rectangle (on the same side as the cursor).
 
+  You can use this rectangle support without activating CUA by calling the
+@code{cua-rectangle-mark-mode} command.
+
   With CUA you can easily copy text and rectangles into and out of
 registers by providing a one-digit numeric prefix to the kill, copy,
 and yank commands, e.g., @kbd{C-1 C-c} copies the region into register
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 23d1f9fa20e..26e9539d750 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -867,7 +867,7 @@ makes inserting inserting a newline between two adjacent pairs also
 automatically open and extra newline after point.
 
 @item
-@code{electric-skip-whitespace}, when non-@code{nil}, causes the minor
+@code{electric-pair-skip-whitespace}, when non-@code{nil}, causes the minor
 mode to skip whitespace forward before deciding whether to skip over
 the closing delimiter.
 @end itemize
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 63e9e2bbc23..d618912de8a 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1142,7 +1142,7 @@ The list of completions is displayed as text in a buffer named
 @file{*Completions*}.
 @end deffn
 
-@defun display-completion-list completions &optional common-substring
+@defun display-completion-list completions
 This function displays @var{completions} to the stream in
 @code{standard-output}, usually a buffer.  (@xref{Read and Print}, for more
 information about streams.)  The argument @var{completions} is normally
@@ -1153,13 +1153,6 @@ which is printed as if the strings were concatenated.  The first of
 the two strings is the actual completion, the second string serves as
 annotation.
 
-The argument @var{common-substring} is the prefix that is common to
-all the completions.  With normal Emacs completion, it is usually the
-same as the string that was completed.  @code{display-completion-list}
-uses this to highlight text in the completion list for better visual
-feedback.  This is not needed in the minibuffer; for minibuffer
-completion, you can pass @code{nil}.
-
 This function is called by @code{minibuffer-completion-help}.  A
 common way to use it is together with
 @code{with-output-to-temp-buffer}, like this:
@@ -1167,8 +1160,7 @@ common way to use it is together with
 @example
 (with-output-to-temp-buffer "*Completions*"
   (display-completion-list
-    (all-completions (buffer-string) my-alist)
-    (buffer-string)))
+    (all-completions (buffer-string) my-alist)))
 @end example
 @end defun
 
diff --git a/etc/NEWS b/etc/NEWS
index 278bc7fd003..495f119443a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -159,6 +159,7 @@ non-nil, they output the same results.
 +++
 *** The key `?' now describes prefix bindings, like `C-h'.
 
+---
 *** The command `describe-function' has been extended for EIEIO.
 Running it on constructors will show a full description of the
 generated class.  For generic functions, it will show all
@@ -244,6 +245,7 @@ There is no reason to set this to nil except for debugging purposes.
 This unfinished feature was introduced by accident in Emacs 23.1;
 simply disabling Transient Mark mode does the same thing.
 
+---
 ** The default value of `comment-use-global-state' is now t,
 and this variable has been marked obsolete.
 
@@ -438,6 +440,7 @@ This executes statements while allowing for control transfer to labels.
 
 ** CUA mode
 
++++
 *** CUA mode now uses `delete-selection-mode' and `shift-select-mode'.
 Hence, you can now enable it independently from those modes, and from
 `transient-mark-mode'.
@@ -446,7 +449,9 @@ Hence, you can now enable it independently from those modes, and from
 *** `cua-highlight-region-shift-only' is now obsolete.
 You can disable `transient-mark-mode' to get the same result.
 
-*** CUA's rectangles can now be used via `cua-rectangle-mark-mode'.
++++
+*** CUA's rectangles can now be used without CUA by calling the command
+`cua-rectangle-mark-mode'.
 
 ** CFEngine mode
 
@@ -482,6 +487,7 @@ The results display in the mode line.
 
 ** Electric Pair mode
 
++++
 *** New option `electric-pair-preserve-balance', enabled by default.
 If non-nil, pairing/skipping only kicks in when that help the balance
 of parentheses and quotes, i.e. the buffer should end up at least as
@@ -490,21 +496,25 @@ balanced as before.
 You can further control this behavior by adjusting the predicates
 stored in `electric-pair-inhibit-predicate' and `electric-pair-skip-self'.
 
++++
 *** New option `electric-pair-delete-adjacent-pairs', enabled by default.
 In `electric-pair-mode', the commands `backward-delete-char' and
 `backward-delete-char-untabify' are now bound to electric variants
 that delete the closer when invoked between adjacent pairs.
 
++++
 *** New option `electric-pair-open-newline-between-pairs', enabled by default.
 In `electric-pair-mode', inserting a newline between adjacent pairs
 opens an extra newline after point, which is indented if
 `electric-indent-mode' is also set.
 
++++
 *** New option `electric-pair-skip-whitespace', enabled by default.
 This controls if skipping over closing delimiters should jump over any
 whitespace slack.  Setting it to `chomp' makes it delete this
 whitespace.  See also the variable `electric-pair-skip-whitespace-chars'.
 
+---
 *** New variables control the pairing in strings and comments.
 You can customize `electric-pair-text-pairs' and
 `electric-pair-text-syntax-table' to tweak pairing behavior inside