upstream

23 files changed, 421 insertions, 308 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3089d2b3d5d..3fa8eece141 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,18 @@
+2011-10-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * killing.texi (Deletion): Add xref to Using Region.  Document
+        delete-forward-char.
+        (Yanking): Move yank-excluded-properties to Lisp manual.  Move C-y
+        description here.  Recommend C-u C-SPC for jumping to mark.
+        (Kill Ring): Move kill ring variable documentation here.
+        (Primary Selection): Copyedits.
+        (Rectangles): Document new command rectangle-number-lines.
+        (CUA Bindings): Note that this disables the mark-even-if-inactive
+        behavior for C-x and C-c.
+
+        * mark.texi (Mark): Mention "active region" terminology.
+        (Using Region): Document delete-active-region.
+
 2011-10-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * mark.texi (Mark): Clarify description of disabled Transient Mark
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index eb2bcc109e8..b6ed47fdb3f 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1403,7 +1403,7 @@ directory than in this one.  It also marks files with no counterpart,
 in both directories, as always.
 
 @cindex drag and drop, Dired
-  On the X window system, Emacs supports the ``drag and drop''
+  On the X Window System, Emacs supports the ``drag and drop''
 protocol.  You can drag a file object from another program, and drop
 it onto a Dired buffer; this either moves, copies, or creates a link
 to the file in that directory.  Precisely which action is taken is
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index d34ecb01ad6..8a15c783fc0 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -319,9 +319,9 @@ Killing and Moving Text
 
 Yanking
 
-* Kill Ring::           Where killed text is stored.  Basic yanking.
-* Appending Kills::     Several kills in a row all yank together.
+* Kill Ring::           Where killed text is stored.
 * Earlier Kills::       Yanking something killed some time ago.
+* Appending Kills::     Several kills in a row all yank together.
 
 Killing and Yanking on Graphical Displays
 
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index fc78f90db15..14fdb3121a4 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -93,7 +93,7 @@ clicked.
   Normally, Emacs does not distinguish between ordinary mouse clicks
 and clicks that select a frame.  When you click on a frame to select
 it, that also changes the selected window and cursor position
-according to the mouse click position.  On the X window system, you
+according to the mouse click position.  On the X Window System, you
 can change this behavior by setting the variable
 @code{x-mouse-click-focus-ignore-position} to @code{t}.  Then the
 first click selects the frame, but does not affect the selected window
@@ -961,7 +961,7 @@ the left of each Emacs window, running the height of the
 window.@footnote{Placing it at the left is usually more useful with
 overlapping frames with text starting at the left margin.}
 
-  When Emacs is compiled with GTK+ support on the X window system, or
+  When Emacs is compiled with GTK+ support on the X Window System, or
 in operating systems such as Microsoft Windows or Mac OS, you can use
 the scroll bar as you do in other graphical applications.  If you
 click @kbd{Mouse-1} on the scroll bar's up and down buttons, that
@@ -971,7 +971,7 @@ the entire height of the window, like @kbd{M-v} and @kbd{C-v}
 respectively (@pxref{Moving Point}).  Dragging the inner box with
 @kbd{Mouse-1} scrolls the window continuously.
 
-  If Emacs is compiled without GTK+ support on the X window system,
+  If Emacs is compiled without GTK+ support on the X Window System,
 the scroll bar behaves differently.  The scroll bar's inner box is
 drawn to represent the portion of the buffer currently displayed, with
 the entire height of the scroll bar representing the entire length of
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 06839ce5187..493316daa52 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -77,12 +77,18 @@ the most part, the Emacs commands that delete text are those that
 erase just one character or only whitespace.
 
 @table @kbd
-@item C-d
-@itemx @key{Delete}
-Delete next character (@code{delete-char}).
 @item @key{DEL}
 @itemx @key{Backspace}
-Delete previous character (@code{delete-backward-char}).
+Delete the previous character, or the text in the region if it is
+active (@code{delete-backward-char}).
+
+@item @key{Delete}
+Delete the next character, or the text in the region if it is active
+(@code{delete-forward-char}).
+
+@item C-d
+Delete the next character (@code{delete-char}).
+
 @item M-\
 Delete spaces and tabs around point (@code{delete-horizontal-space}).
 @item M-@key{SPC}
@@ -95,9 +101,13 @@ Join two lines by deleting the intervening newline, along with any
 indentation following it (@code{delete-indentation}).
 @end table
 
-  We have already described the basic deletion commands @kbd{C-d}
-(@code{delete-char}) and @key{DEL} (@code{delete-backward-char}).
-@xref{Erasing}.
+  We have already described the basic deletion commands @key{DEL}
+(@code{delete-backward-char}), @key{delete}
+(@code{delete-forward-char}), and @kbd{C-d} (@code{delete-char}).
+@xref{Erasing}.  With a numeric argument, they delete the specified
+number of characters.  If the numeric argument is omitted or one, they
+delete all the text in the region if it is active (@pxref{Using
+Region}).
 
 @kindex M-\
 @findex delete-horizontal-space
@@ -177,35 +187,35 @@ key sequence @kbd{C-S-backspace}.
 
 @table @kbd
 @item C-w
-Kill region (@code{kill-region}).  @xref{Mark}.
+Kill the region (@code{kill-region}).
 @item M-w
-Save region as last killed text without actually killing it
-(@code{kill-ring-save}).  Some programs call this ``copying.''
+Copy the region into the kill ring (@code{kill-ring-save}).
 @item M-d
-Kill word (@code{kill-word}).  @xref{Words}.
+Kill the next word (@code{kill-word}).  @xref{Words}.
 @item M-@key{DEL}
-Kill word backwards (@code{backward-kill-word}).
+Kill one word backwards (@code{backward-kill-word}).
 @item C-x @key{DEL}
 Kill back to beginning of sentence (@code{backward-kill-sentence}).
 @xref{Sentences}.
 @item M-k
-Kill to end of sentence (@code{kill-sentence}).
+Kill to the end of the sentence (@code{kill-sentence}).
 @item C-M-k
 Kill the following balanced expression (@code{kill-sexp}).  @xref{Expressions}.
 @item M-z @var{char}
 Kill through the next occurrence of @var{char} (@code{zap-to-char}).
 @end table
 
-  Apart from @kbd{C-k}, the most commonly-used kill command is
-@kbd{C-w} (@code{kill-region}), which kills the text in the region
-(i.e., between point and mark).  @xref{Mark}.  If the mark is inactive
-when you type @kbd{C-w}, it first reactivates the mark where it was
-last set.  The mark is deactivated at the end of the command.
-
+@kindex C-w
+@findex kill-region
 @kindex M-w
 @findex kill-ring-save
-  @kbd{M-w} (@code{kill-ring-save}) copies the region into the kill
-ring without removing it from the buffer.
+  One of the commonly-used kill commands is @kbd{C-w}
+(@code{kill-region}), which kills the text in the region
+(@pxref{Mark}).  Similarly, @kbd{M-w} (@code{kill-ring-save}) copies
+the text in the region into the kill ring without removing it from the
+buffer.  If the mark is inactive when you type @kbd{C-w} or @kbd{M-w},
+the command acts on the text between point and where you last set the
+mark (@pxref{Using Region}).
 
   Emacs also provides commands to kill specific syntactic units:
 words, with @kbd{M-@key{DEL}} and @kbd{M-d} (@pxref{Words}); balanced
@@ -248,34 +258,45 @@ kill-ring entry, without duplication.
 @cindex pasting
 
   @dfn{Yanking} means reinserting text previously killed.  The usual
-way to move or copy text is to kill it and then yank it elsewhere one
-or more times.
+way to move or copy text is to kill it and then yank it elsewhere.
 
 @table @kbd
 @item C-y
-Yank last killed text (@code{yank}).
+Yank the last kill into the buffer, at point (@code{yank}).
 @item M-y
-Replace text just yanked with an earlier batch of killed text
-(@code{yank-pop}).
+Replace the text just yanked with an earlier batch of killed text
+(@code{yank-pop}).  @xref{Earlier Kills}.
 @item C-M-w
-Append next kill to last batch of killed text (@code{append-next-kill}).
+Cause the following command, if it is a kill command, to append to the
+previous kill (@code{append-next-kill}).  @xref{Appending Kills}.
 @end table
 
-@cindex yanking and text properties
-@vindex yank-excluded-properties
-  The yank commands discard certain properties from the yanked text.
-These are properties that might lead to annoying results, such as
-causing the text to respond to the mouse or specifying key bindings.
-The list of properties to discard is stored in the variable
-@code{yank-excluded-properties}.  These properties are also discarded
-when yanking register contents and rectangles.  @xref{Text
-Properties,,, elisp, the Emacs Lisp Reference Manual}, for more
-information about text properties.
+@kindex C-y
+@findex yank
+  The basic yanking command is @kbd{C-y} (@code{yank}).  It inserts
+the most recent kill, leaving the cursor at the end of the inserted
+text.  It also sets the mark at the beginning of the inserted text,
+without activating the mark; this lets you jump easily to that
+position, if you wish, with @kbd{C-u C-@key{SPC}} (@pxref{Mark Ring}).
+
+  With a plain prefix argument (@kbd{C-u C-y}), the command instead
+leaves the cursor in front of the inserted text, and sets the mark at
+the end.  Using any other prefix argument specifies an earlier kill;
+e.g. @kbd{C-u 4 C-y} reinserts the fourth most recent kill.
+@xref{Earlier Kills}.
+
+  On graphical displays, @kbd{C-y} first checks if another application
+has placed any text in the system clipboard more recently than the
+last Emacs kill.  If so, it inserts the text in the clipboard instead.
+Thus, Emacs effectively treats ``cut'' or ``copy'' clipboard
+operations performed in other applications like Emacs kills, except
+that they are not recorded in the kill ring.  @xref{Cut and Paste},
+for details.
 
 @menu
-* Kill Ring::           Where killed text is stored.  Basic yanking.
-* Appending Kills::     Several kills in a row all yank together.
+* Kill Ring::           Where killed text is stored.
 * Earlier Kills::       Yanking something killed some time ago.
+* Appending Kills::     Several kills in a row all yank together.
 @end menu
 
 @node Kill Ring
@@ -284,31 +305,69 @@ information about text properties.
   The @dfn{kill ring} is a list of blocks of text that were previously
 killed.  There is only one kill ring, shared by all buffers, so you
 can kill text in one buffer and yank it in another buffer.  This is
-the usual way to move text from one file to another.  (There are
+the usual way to move text from one buffer to another.  (There are
 several other methods: for instance, you could store the text in a
 register; see @ref{Registers}.  @xref{Accumulating Text}, for some
 other ways to move text around.)
 
-@kindex C-y
-@findex yank
-  @kbd{C-y} (@code{yank}) reinserts the text of the most recent kill,
-leaving the cursor at the end of the text.  It also adds the position
-of the beginning of the text to the mark ring, without activating the
-mark; this allows you to jump easily to that position with @kbd{C-x
-C-x} (@pxref{Setting Mark}).
+@vindex kill-ring-max
+  The maximum number of entries in the kill ring is controlled by the
+variable @code{kill-ring-max}.  The default is 60.  If you make a new
+kill when this limit has been reached, Emacs makes room by deleting
+the oldest entry in the kill ring.
 
-  On graphical displays, @kbd{C-y} first checks if another application
-has placed any text in the system clipboard more recently than the
-last Emacs kill.  If so, it inserts from the clipboard instead of the
-kill ring.  Conceptually, you can think of the clipboard as an
-``extra'' entry in the kill ring, which is present if you recently cut
-or copied some text in another application.  @xref{Cut and Paste}.
+@vindex kill-ring
+  The actual contents of the kill ring are stored in a variable named
+@code{kill-ring}; you can view the entire contents of the kill ring
+with @kbd{C-h v kill-ring}.
+
+@node Earlier Kills
+@subsection Yanking Earlier Kills
+@cindex yanking previous kills
+
+  As explained in @ref{Yanking}, you can use a numeric argument to
+@kbd{C-y} to yank text that is no longer the most recent kill.  This
+is useful if you remember which kill ring entry you want.  If you
+don't, you can use the @kbd{M-y} (@code{yank-pop}) command to cycle
+through the possibilities.
+
+@kindex M-y
+@findex yank-pop
+  If the previous command was a yank command, @kbd{M-y} takes the text
+that was yanked and replaces it with the text from an earlier kill.
+So, to recover the text of the next-to-the-last kill, first use
+@kbd{C-y} to yank the last kill, and then use @kbd{M-y} to replace it
+with the previous kill.  @kbd{M-y} is allowed only after a @kbd{C-y}
+or another @kbd{M-y}.
+
+  You can understand @kbd{M-y} in terms of a ``last yank'' pointer which
+points at an entry in the kill ring.  Each time you kill, the ``last
+yank'' pointer moves to the newly made entry at the front of the ring.
+@kbd{C-y} yanks the entry which the ``last yank'' pointer points to.
+@kbd{M-y} moves the ``last yank'' pointer to a different entry, and the
+text in the buffer changes to match.  Enough @kbd{M-y} commands can move
+the pointer to any entry in the ring, so you can get any entry into the
+buffer.  Eventually the pointer reaches the end of the ring; the next
+@kbd{M-y} loops back around to the first entry again.
+
+  @kbd{M-y} moves the ``last yank'' pointer around the ring, but it does
+not change the order of the entries in the ring, which always runs from
+the most recent kill at the front to the oldest one still remembered.
+
+  @kbd{M-y} can take a numeric argument, which tells it how many entries
+to advance the ``last yank'' pointer by.  A negative argument moves the
+pointer toward the front of the ring; from the front of the ring, it
+moves ``around'' to the last entry and continues forward from there.
+
+  Once the text you are looking for is brought into the buffer, you can
+stop doing @kbd{M-y} commands and it will stay there.  It's just a copy
+of the kill ring entry, so editing it in the buffer does not change
+what's in the ring.  As long as no new killing is done, the ``last
+yank'' pointer remains at the same place in the kill ring, so repeating
+@kbd{C-y} will yank another copy of the same previous kill.
 
-  With a plain prefix argument (@kbd{C-u C-y}), the @code{yank}
-command instead leaves the cursor in front of the text, and adds the
-position of the end of the text to the mark ring.  Using any other
-prefix argument specifies an earlier kill; for example, @kbd{C-u 4
-C-y} reinserts the fourth most recent kill.  @xref{Earlier Kills}.
+  When you call @kbd{C-y} with a numeric argument, that also sets the
+``last yank'' pointer to the entry that it yanks.
 
 @node Appending Kills
 @subsection Appending Kills
@@ -365,65 +424,6 @@ accumulate them to be yanked back in one place.@refill
   A kill command following @kbd{M-w} (@code{kill-ring-save}) does not
 append to the text that @kbd{M-w} copied into the kill ring.
 
-@node Earlier Kills
-@subsection Yanking Earlier Kills
-
-@cindex yanking previous kills
-@kindex M-y
-@findex yank-pop
-  To recover killed text that is no longer the most recent kill, use the
-@kbd{M-y} command (@code{yank-pop}).  It takes the text previously
-yanked and replaces it with the text from an earlier kill.  So, to
-recover the text of the next-to-the-last kill, first use @kbd{C-y} to
-yank the last kill, and then use @kbd{M-y} to replace it with the
-previous kill.  @kbd{M-y} is allowed only after a @kbd{C-y} or another
-@kbd{M-y}.
-
-  You can understand @kbd{M-y} in terms of a ``last yank'' pointer which
-points at an entry in the kill ring.  Each time you kill, the ``last
-yank'' pointer moves to the newly made entry at the front of the ring.
-@kbd{C-y} yanks the entry which the ``last yank'' pointer points to.
-@kbd{M-y} moves the ``last yank'' pointer to a different entry, and the
-text in the buffer changes to match.  Enough @kbd{M-y} commands can move
-the pointer to any entry in the ring, so you can get any entry into the
-buffer.  Eventually the pointer reaches the end of the ring; the next
-@kbd{M-y} loops back around to the first entry again.
-
-  @kbd{M-y} moves the ``last yank'' pointer around the ring, but it does
-not change the order of the entries in the ring, which always runs from
-the most recent kill at the front to the oldest one still remembered.
-
-  @kbd{M-y} can take a numeric argument, which tells it how many entries
-to advance the ``last yank'' pointer by.  A negative argument moves the
-pointer toward the front of the ring; from the front of the ring, it
-moves ``around'' to the last entry and continues forward from there.
-
-  Once the text you are looking for is brought into the buffer, you can
-stop doing @kbd{M-y} commands and it will stay there.  It's just a copy
-of the kill ring entry, so editing it in the buffer does not change
-what's in the ring.  As long as no new killing is done, the ``last
-yank'' pointer remains at the same place in the kill ring, so repeating
-@kbd{C-y} will yank another copy of the same previous kill.
-
-  If you know how many @kbd{M-y} commands it would take to find the
-text you want, you can yank that text in one step using @kbd{C-y} with
-a numeric argument.  @kbd{C-y} with an argument restores the text from
-the specified kill ring entry, counting back from the most recent as
-1.  Thus, @kbd{C-u 2 C-y} gets the next-to-the-last block of killed
-text---it is equivalent to @kbd{C-y M-y}.  @kbd{C-y} with a numeric
-argument starts counting from the ``last yank'' pointer, and sets the
-``last yank'' pointer to the entry that it yanks.
-
-@vindex kill-ring-max
-  The length of the kill ring is controlled by the variable
-@code{kill-ring-max}; no more than that many blocks of killed text are
-saved.
-
-@vindex kill-ring
-  The actual contents of the kill ring are stored in a variable named
-@code{kill-ring}; you can view the entire contents of the kill ring with
-the command @kbd{C-h v kill-ring}.
-
 @node Cut and Paste
 @section ``Cut and Paste'' Operations on Graphical Displays
 @cindex cut
@@ -462,7 +462,7 @@ and yank commands in Emacs make use of it.
   When you kill some text with a command such as @kbd{C-w}
 (@code{kill-region}), or copy it to the kill ring with a command such
 as @kbd{M-w} (@code{kill-ring-save}), that text is also put in the
-clipboard.  @xref{Killing}.
+clipboard.
 
 @vindex save-interprogram-paste-before-kill
   When an Emacs kill command puts text in the clipboard, the existing
@@ -472,12 +472,11 @@ will first save the clipboard to its kill ring, preventing you from
 losing the old clipboard data---at the risk of high memory consumption
 if that data turns out to be large.
 
-  The usual yank commands, such as @kbd{C-y} (@code{yank}), also use
-the clipboard.  If another application ``owns'' the clipboard---i.e.,
-if you cut or copied text there more recently than your last kill
-command in Emacs---then Emacs yanks from the clipboard instead of the
-kill ring.  Otherwise, it yanks from the kill ring, as described in
-@ref{Yanking}.
+  Yank commands, such as @kbd{C-y} (@code{yank}), also use the
+clipboard.  If another application ``owns'' the clipboard---i.e., if
+you cut or copied text there more recently than your last kill command
+in Emacs---then Emacs yanks from the clipboard instead of the kill
+ring.
 
 @vindex yank-pop-change-selection
   Normally, rotating the kill ring with @kbd{M-y} (@code{yank-pop})
@@ -511,20 +510,20 @@ yanks the contents of the clipboard at point.
 @cindex primary selection
 @cindex selection, primary
 
-  Under the X window system, there exists a @dfn{primary selection}
+  Under the X Window System, there exists a @dfn{primary selection}
 containing the last stretch of text selected in an X application
 (usually by dragging the mouse).  Typically, this text can be inserted
 into other X applications by @kbd{mouse-2} clicks.  The primary
-selection is separate from the clipboard (@pxref{Clipboard}).  Its
-contents are more ``fragile''; they are overwritten by any mouse
-selection, whereas the clipboard is only overwritten by explicit
-``cut'' or ``copy'' commands.
+selection is separate from the clipboard.  Its contents are more
+``fragile''; they are overwritten each time you select text with the
+mouse, whereas the clipboard is only overwritten by explicit ``cut''
+or ``copy'' commands.
 
-  Under X, whenever you set an active region (@pxref{Mark}), Emacs
-saves the text in the active region to the primary selection.  This
-applies to active regions made by dragging or clicking the mouse
-(@pxref{Mouse Commands}), and those made by keyboard commands (e.g. by
-typing @kbd{C-@key{SPC}} and moving point; see @ref{Setting Mark}).
+  Under X, whenever the region is active (@pxref{Mark}), the text in
+the region is saved in the primary selection.  This applies regardless
+of whether the region was made by dragging or clicking the mouse
+(@pxref{Mouse Commands}), or by keyboard commands (e.g. by typing
+@kbd{C-@key{SPC}} and moving point; @pxref{Setting Mark}).
 
 @vindex select-active-regions
   If you change the variable @code{select-active-regions} to
@@ -636,9 +635,9 @@ starting from wherever point happens to be at that moment.
 successive uses of @code{append-to-buffer} accumulate the text in the
 specified buffer in the same order as they were copied.  Strictly
 speaking, @code{append-to-buffer} does not always append to the text
-already in the buffer---it appends only if point in that buffer is at the end.
-However, if @code{append-to-buffer} is the only command you use to alter
-a buffer, then point is always at the end.
+already in the buffer---it appends only if point in that buffer is at
+the end.  However, if @code{append-to-buffer} is the only command you
+use to alter a buffer, then point is always at the end.
 
   @kbd{M-x prepend-to-buffer} is just like @code{append-to-buffer}
 except that point in the other buffer is left before the copied text, so
@@ -682,19 +681,16 @@ them.  Rectangle commands are useful with text in multicolumn formats,
 and for changing text into or out of such formats.
 
 @cindex mark rectangle
-  When you must specify a rectangle for a command to work on, you do it
-by putting the mark at one corner and point at the opposite corner.  The
-rectangle thus specified is called the @dfn{region-rectangle} because
-you control it in much the same way as the region is controlled.  But
-remember that a given combination of point and mark values can be
-interpreted either as a region or as a rectangle, depending on the
-command that uses them.
-
-  If point and the mark are in the same column, the rectangle they
-delimit is empty.  If they are in the same line, the rectangle is one
-line high.  This asymmetry between lines and columns comes about
-because point (and likewise the mark) is between two columns, but within
-a line.
+  To specify a rectangle for a command to work on, set the mark at one
+corner and point at the opposite corner.  The rectangle thus specified
+is called the @dfn{region-rectangle}.  If point and the mark are in
+the same column, the region-rectangle is empty.  If they are in the
+same line, the region-rectangle is one line high.
+
+  The region-rectangle is controlled in much the same way as the
+region is controlled.  But remember that a given combination of point
+and mark values can be interpreted either as a region or as a
+rectangle, depending on the command that uses them.
 
 @table @kbd
 @item C-x r k
@@ -708,7 +704,11 @@ Yank the last killed rectangle with its upper left corner at point
 @item C-x r o
 Insert blank space to fill the space of the region-rectangle
 (@code{open-rectangle}).  This pushes the previous contents of the
-region-rectangle rightward.
+region-rectangle to the right.
+@item C-x r N
+Insert line numbers along the left edge of the region-rectangle
+(@code{rectangle-number-lines}).  This pushes the previous contents of
+the region-rectangle to the right.
 @item C-x r c
 Clear the region-rectangle by replacing all of its contents with spaces
 (@code{clear-rectangle}).
@@ -722,42 +722,39 @@ Replace rectangle contents with @var{string} on each line
 Insert @var{string} on each line of the rectangle.
 @end table
 
-  The rectangle operations fall into two classes: commands for
-deleting and inserting rectangles, and commands for blank rectangles.
+  The rectangle operations fall into two classes: commands to erase or
+insert rectangles, and commands to make blank rectangles.
 
 @kindex C-x r k
 @kindex C-x r d
 @findex kill-rectangle
 @findex delete-rectangle
-  There are two ways to get rid of the text in a rectangle: you can
-discard the text (delete it) or save it as the ``last killed''
-rectangle.  The commands for these two ways are @kbd{C-x r d}
-(@code{delete-rectangle}) and @kbd{C-x r k} (@code{kill-rectangle}).  In
-either case, the portion of each line that falls inside the rectangle's
-boundaries is deleted, causing any following text on the line to
-move left into the gap.
-
-  Note that ``killing'' a rectangle is not killing in the usual sense; the
+  There are two ways to erase the text in a rectangle: @kbd{C-x r d}
+(@code{delete-rectangle}) to delete the text outright, or @kbd{C-x r
+k} (@code{kill-rectangle}) to remove the text and and save it as the
+@dfn{last killed rectangle}.  In both cases, erasing the
+region-rectangle is like erasing the specified text on each line of
+the rectange; if there is any following text on the line, it moves
+backwards to fill the gap.
+
+  ``Killing'' a rectangle is not killing in the usual sense; the
 rectangle is not stored in the kill ring, but in a special place that
-can only record the most recent rectangle killed.  This is because yanking
-a rectangle is so different from yanking linear text that different yank
-commands have to be used.  It is hard to define yank-popping for rectangles,
-so we do not try.
+only records the most recent rectangle killed.  This is because
+yanking a rectangle is so different from yanking linear text that
+different yank commands have to be used.  Yank-popping is not defined
+for rectangles.
 
 @kindex C-x r y
 @findex yank-rectangle
   To yank the last killed rectangle, type @kbd{C-x r y}
-(@code{yank-rectangle}).  Yanking a rectangle is the opposite of killing
-one.  Point specifies where to put the rectangle's upper left corner.
-The rectangle's first line is inserted there, the rectangle's second
-line is inserted at the same horizontal position, but one line
-vertically down, and so on.  The number of lines affected is determined
-by the height of the saved rectangle.
-
-  You can convert single-column lists into double-column lists using
-rectangle killing and yanking; kill the second half of the list as a
-rectangle and then yank it beside the first line of the list.
-@xref{Two-Column}, for another way to edit multi-column text.
+(@code{yank-rectangle}).  The rectangle's first line is inserted at
+point, the rectangle's second line is inserted at the same horizontal
+position one line vertically below, and so on.  The number of lines
+affected is determined by the height of the saved rectangle.
+
+  For example, you can convert two single-column lists into a
+double-column list by killing one of the single-column lists as a
+rectangle, and then yanking it beside the other list.
 
   You can also copy rectangles into and out of registers with @kbd{C-x r
 r @var{r}} and @kbd{C-x r i @var{r}}.  @xref{Rectangle Registers}.
@@ -767,17 +764,26 @@ r @var{r}} and @kbd{C-x r i @var{r}}.  @xref{Rectangle Registers}.
 @kindex C-x r c
 @findex clear-rectangle
   There are two commands you can use for making blank rectangles:
-@kbd{C-x r c} (@code{clear-rectangle}) which blanks out existing text,
-and @kbd{C-x r o} (@code{open-rectangle}) which inserts a blank
-rectangle.  Clearing a rectangle is equivalent to deleting it and then
-inserting a blank rectangle of the same size.
+@kbd{C-x r c} (@code{clear-rectangle}) blanks out existing text in the
+region-rectangle, and @kbd{C-x r o} (@code{open-rectangle}) inserts a
+blank rectangle.
 
 @findex delete-whitespace-rectangle
-  The command @kbd{M-x delete-whitespace-rectangle} deletes horizontal
-whitespace starting from a particular column.  This applies to each of
-the lines in the rectangle, and the column is specified by the left
-edge of the rectangle.  The right edge of the rectangle does not make
-any difference to this command.
+  @kbd{M-x delete-whitespace-rectangle} deletes horizontal whitespace
+starting from a particular column.  This applies to each of the lines
+in the rectangle, and the column is specified by the left edge of the
+rectangle.  The right edge of the rectangle does not make any
+difference to this command.
+
+@kindex C-x r N
+@findex rectangle
+  The command @kbd{C-x r N} (@code{rectangle-number-lines}) inserts
+line numbers along the left edge of the region-rectangle.  Normally,
+the numbering begins from 1 (for the first line of the rectangle).
+With a prefix argument, the command prompts for a number to begin
+from, and for a format string with which to print the numbers
+(@pxref{Formatting Strings,,, elisp, The Emacs Lisp Reference
+Manual}).
 
 @kindex C-x r t
 @findex string-rectangle
@@ -801,18 +807,25 @@ shifting the original text to the right.
 @vindex cua-enable-cua-keys
   The command @kbd{M-x cua-mode} sets up key bindings that are
 compatible with the Common User Access (CUA) system used in many other
-applications.  @kbd{C-x} means cut (kill), @kbd{C-c} copy, @kbd{C-v}
-paste (yank), and @kbd{C-z} undo.  Standard Emacs commands like
-@kbd{C-x C-c} still work, because @kbd{C-x} and @kbd{C-c} only take
-effect when the mark is active (and the region is highlighted).
-However, if you don't want to override these bindings in Emacs at all,
-set @code{cua-enable-cua-keys} to @code{nil}.
+applications.
+
+  When CUA mode is enabled, the keys @kbd{C-x}, @kbd{C-c}, @kbd{C-v},
+and @kbd{C-z} invoke commands that cut (kill), copy, paste (yank), and
+undo respectively.  The @kbd{C-x} and @kbd{C-c} keys perform cut and
+copy only if the region is active.  Otherwise, they still act as
+prefix keys, so that standard Emacs commands like @kbd{C-x C-c} still
+work.  Note that this means the variable @code{mark-even-if-inactive}
+has no effect for @kbd{C-x} and @kbd{C-c} (@pxref{Using Region}).
 
   To enter an Emacs command like @kbd{C-x C-f} while the mark is
 active, use one of the following methods: either hold @kbd{Shift}
 together with the prefix key, e.g. @kbd{S-C-x C-f}, or quickly type
 the prefix key twice, e.g. @kbd{C-x C-x C-f}.
 
+  To disable the overriding of standard Emacs binding by CUA mode,
+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}).
 
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 21d90a3fc79..0eccef41711 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -16,18 +16,22 @@ The region always extends between point and the mark, no matter which
 one comes earlier in the text; each time you move point, the region
 changes.
 
+@cindex active region
   Setting the mark at a position in the text also @dfn{activates} it.
-When the mark is active, Emacs indicates the extent of the region by
-highlighting the text within it, using the @code{region} face
-(@pxref{Face Customization}).  After certain non-motion commands,
-including any command that changes the text in the buffer, Emacs
-automatically @dfn{deactivates} the mark; this turns off the
-highlighting.  You can also explicitly deactivate the mark at any
-time, by typing @kbd{C-g} (@pxref{Quitting}).
-
-  This default behavior is known as Transient Mark mode.  Disabling
-Transient Mark mode switches Emacs to an alternative behavior, in
-which the region is usually not highlighted.  @xref{Disabled Transient Mark}.
+When the mark is active, we say also that the region is active; Emacs
+indicates its extent by highlighting the text within it, using the
+@code{region} face (@pxref{Face Customization}).
+
+  After certain non-motion commands, including any command that
+changes the text in the buffer, Emacs automatically @dfn{deactivates}
+the mark; this turns off the highlighting.  You can also explicitly
+deactivate the mark at any time, by typing @kbd{C-g}
+(@pxref{Quitting}).
+
+  The above default behavior is known as Transient Mark mode.
+Disabling Transient Mark mode switches Emacs to an alternative
+behavior, in which the region is usually not highlighted.
+@xref{Disabled Transient Mark}.
 
 @vindex highlight-nonselected-windows
   Setting the mark in one buffer has no effect on the marks in other
@@ -141,10 +145,10 @@ can tell that a command does this when it shows @samp{Mark set} in the
 echo area.
 
 @cindex primary selection
-  Under X, every time the region changes while the mark is active,
-Emacs saves the text in the region to the @dfn{primary selection}.
-This lets you insert that text into other X applications with
-@kbd{mouse-2} clicks.  @xref{Primary Selection}.
+  Under X, every time the active region changes, Emacs saves the text
+in the region to the @dfn{primary selection}.  This lets you insert
+that text into other X applications with @kbd{mouse-2} clicks.
+@xref{Primary Selection}.
 
 @node Marking Objects
 @section Commands to Mark Textual Objects
@@ -243,18 +247,30 @@ Save it in a buffer or a file (@pxref{Accumulating Text}).
 @end itemize
 
   Some commands have a default behavior when the mark is inactive, but
-operate on the text in the region if the mark is active.  For example,
-@kbd{M-$} (@code{ispell-word}) normally checks the spelling of the
-word at point, but it checks the text in the region if the region is
-active (@pxref{Spelling}).  Normally, such commands use their default
+operate on the region if the mark is active.  For example, @kbd{M-$}
+(@code{ispell-word}) normally checks the spelling of the word at
+point, but it checks the text in the region if the mark is active
+(@pxref{Spelling}).  Normally, such commands use their default
 behavior if the region is empty (i.e., if mark and point are at the
 same position).  If you want them to operate on the empty region,
 change the variable @code{use-empty-active-region} to @code{t}.
 
+@vindex delete-active-region
+  As described in @ref{Erasing}, the @key{DEL}
+(@code{backward-delete-char}) and @key{delete}
+(@code{delete-forward-char}) commands also act this way.  If the mark
+is active, they delete the text in the region.  (As an exception, if
+you supply a numeric argument @var{n}, where @var{n} is not one, these
+commands delete @var{n} characters regardless of whether the mark is
+active).  If you change the variable @code{delete-active-region} to
+@code{nil}, then these commands don't act differently when the mark is
+active.  If you change the value to @code{kill}, these commands
+@dfn{kill} the region instead of deleting it (@pxref{Killing}).
+
 @vindex mark-even-if-inactive
-  Other commands always operate on the text in the region, and have no
-default behavior.  Such commands usually have the word @code{region}
-in their names, like @kbd{C-w} (@code{kill-region}) and @code{C-x C-u}
+  Other commands always operate on the region, and have no default
+behavior.  Such commands usually have the word @code{region} in their
+names, like @kbd{C-w} (@code{kill-region}) and @code{C-x C-u}
 (@code{upcase-region}).  If the mark is inactive, they operate on the
 ``inactive region''---that is, on the text between point and the
 position at which the mark was last set (@pxref{Mark Ring}).  To
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 29b6c69e38f..f676f0b96ce 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -81,8 +81,8 @@ appropriate keyboard coding system (@pxref{Terminal Coding}), and Emacs
 will accept those characters.  Latin-1 characters can also be input by
 using the @kbd{C-x 8} prefix, see @ref{Unibyte Mode}.
 
-On X Window systems, your locale should be set to an appropriate value
-to make sure Emacs interprets keyboard input correctly; see
+On the X Window System, your locale should be set to an appropriate
+value to make sure Emacs interprets keyboard input correctly; see
 @ref{Language Environments, locales}.
 @end itemize
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index fa5aac6e9ec..345e69e6989 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * text.texi (Yanking): Document yank-excluded-properties.
+
+        * package.texi (Packaging Basics): The commentary should say how
+        to begin using the package.
+
 2011-10-11  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Deleting Windows): Mention which window gets
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 62fbc2a9a07..5533f8ab5fa 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -63,7 +63,8 @@ should occupy a single line, ideally in 36 characters or less.
 This is shown in the buffer created by @kbd{C-h P}
 (@code{describe-package}), following the package's brief description
 and installation status.  It normally spans multiple lines, and should
-fully describe the package and its capabilities.
+fully describe the package's capabilities and how to begin using it
+once it is installed.
 
 @item Dependencies
 A list of other packages (possibly including minimal acceptable
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 2348e3706dc..3a081dddc61 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -907,10 +907,11 @@ text that they copy into the buffer.
 
 @defun insert-for-yank string
 This function normally works like @code{insert} except that it doesn't
-insert the text properties in the @code{yank-excluded-properties}
-list.  However, if any part of @var{string} has a non-@code{nil}
-@code{yank-handler} text property, that property can do various
-special processing on that part of the text being inserted.
+insert the text properties (@pxref{Text Properties}) in the list
+variable @code{yank-excluded-properties}.  However, if any part of
+@var{string} has a non-@code{nil} @code{yank-handler} text property,
+that property can do various special processing on that part of the
+text being inserted.
 @end defun
 
 @defun insert-buffer-substring-as-yank buf &optional start end
@@ -958,6 +959,15 @@ region.  @var{function} can set @code{yank-undo-function} to override
 the @var{undo} value.
 @end table
 
+@cindex yanking and text properties
+@defopt yank-excluded-properties
+Yanking discards certain text properties from the yanked text, as
+described above.  The value of this variable is the list of properties
+to discard.  Its default value contains properties that might lead to
+annoying results, such as causing the text to respond to the mouse or
+specifying key bindings.
+@end defopt
+
 @node Yank Commands
 @comment  node-name,  next,  previous,  up
 @subsection Functions for Yanking
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 294c6472000..02c2d2b8750 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,16 @@
+2011-10-14  Glenn Morris  <rgm@gnu.org>
+
+        * ert.texi (Introduction, How to Run Tests)
+        (Running Tests Interactively, Expected Failures)
+        (Tests and Their Environment, Useful Techniques)
+        (Interactive Debugging, Fixtures and Test Suites):
+        Minor rephrasings.
+        (Running Tests Interactively, The @code{should} Macro): Add xrefs.
+        (Running Tests in Batch Mode): Simplify loading instructions.
+        (Test Selectors): Clarify some selectors.
+        (Expected Failures, Useful Techniques):
+        Make examples fit in 80 columns.
+
 2011-10-13  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Basic Operations on Units): Discuss temperature
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index c9b624c6767..d1cecf1347a 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -82,8 +82,8 @@ Extending ERT
 
 Other Testing Concepts
 
-* Mocks and Stubs::             Stubbing out code that is irrelevant to the test.
-* Fixtures and Test Suites::    How ERT differs from tools for other languages.
+* Mocks and Stubs::           Stubbing out code that is irrelevant to the test.
+* Fixtures and Test Suites::  How ERT differs from tools for other languages.
 
 @end detailmenu
 @end menu
@@ -133,8 +133,8 @@ will pass if the three calls to @code{equal} all return true
 @code{should} is a macro with the same meaning as @code{assert} but
 better error reporting.  @xref{The @code{should} Macro}.
 
-Each test should have a name that describes what functionality the
-test tests.  Test names can be chosen arbitrarily --- they are in a
+Each test should have a name that describes what functionality it tests.
+Test names can be chosen arbitrarily --- they are in a
 namespace separate from functions and variables --- but should follow
 the usual Emacs Lisp convention of having a prefix that indicates
 which package they belong to.  Test names are displayed by ERT when
@@ -142,7 +142,7 @@ reporting failures and can be used when selecting which tests to run.
 
 The empty parentheses @code{()} in the first line don't currently have
 any meaning and are reserved for future extension.  They also make
-@code{ert-deftest}'s syntax more similar to @code{defun}.
+the syntax of @code{ert-deftest} more similar to that of @code{defun}.
 
 The docstring describes what feature this test tests.  When running
 tests interactively, the first line of the docstring is displayed for
@@ -163,14 +163,14 @@ You can run tests either in the Emacs you are working in, or on the
 command line in a separate Emacs process in batch mode (i.e., with no
 user interface).  The former mode is convenient during interactive
 development, the latter is useful to make sure that tests pass
-independently of your customizations, allows tests to be invoked from
-makefiles and scripts to be written that run tests in several
+independently of your customizations; and it allows you to invoke
+tests from makefiles, and to write scripts that run tests in several
 different Emacs versions.
 
 @menu
 * Running Tests Interactively::  Run tests in your current Emacs.
 * Running Tests in Batch Mode::  Run tests in emacs -Q.
-* Test Selectors::              Choose which tests to run.
+* Test Selectors::               Choose which tests to run.
 @end menu
 
 
@@ -178,7 +178,8 @@ different Emacs versions.
 @section Running Tests Interactively
 
 You can run the tests that are currently defined in your Emacs with
-the command @kbd{@kbd{M-x} ert @kbd{RET} t @kbd{RET}}.  ERT will pop
+the command @kbd{@kbd{M-x} ert @kbd{RET} t @kbd{RET}}.  (For an
+explanation of the @code{t} argument, @pxref{Test Selectors}.) ERT will pop
 up a new buffer, the ERT results buffer, showing the results of the
 tests run.  It looks like this:
 
@@ -219,10 +220,10 @@ F list-test
                 (different-atoms c d))))
 @end example
 
-At the top, there is a summary of the results: We ran all tests in the
-current Emacs (@code{Selector: t}), 31 of them passed, and 2 failed
-unexpectedly.  @xref{Expected Failures}, for an explanation of the
-term @emph{unexpected} in this context.
+At the top, there is a summary of the results: we ran all tests defined
+in the current Emacs (@code{Selector: t}), 31 of them passed, and 2
+failed unexpectedly.  @xref{Expected Failures}, for an explanation of
+the term @emph{unexpected} in this context.
 
 The line of dots and @code{F}s is a progress bar where each character
 represents one test; it fills while the tests are running.  A dot
@@ -261,7 +262,7 @@ scripts or makefiles.  There are two functions for this purpose,
 They can be used like this:
 
 @example
-emacs -batch -L /path/to/ert -l ert.el -l my-tests.el -f ert-run-tests-batch-and-exit
+emacs -batch -l ert -l my-tests.el -f ert-run-tests-batch-and-exit
 @end example
 
 This command will start up Emacs in batch mode, load ERT, load
@@ -270,9 +271,10 @@ with a zero exit status if all tests passed, or nonzero if any tests
 failed or if anything else went wrong.  It will also print progress
 messages and error diagnostics to standard output.
 
-You may need additional @code{-L} flags to ensure that
-@code{my-tests.el} and all the files that it requires are on your
-@code{load-path}.
+If ERT is not part of your Emacs distribution, you may need to use
+@code{-L /path/to/ert/} so that Emacs can find it.  You may need
+additional @code{-L} flags to ensure that @code{my-tests.el} and all the
+files that it requires are on your @code{load-path}.
 
 
 @node Test Selectors,  , Running Tests in Batch Mode, How to Run Tests
@@ -288,23 +290,26 @@ to Common Lisp's type specifier syntax:
 @item @code{:new} selects all tests that have not been run yet.
 @item @code{:failed} and @code{:passed} select tests according to their most recent result.
 @item @code{:expected}, @code{:unexpected} select tests according to their most recent result.
-@item A string selects all tests that have a name that matches the string, a regexp.
-@item A test selects that test.
+@item A string is a regular expression that selects all tests with matching names.
+@item A test (i.e., an object of @code{ert-test} data type) selects that test.
 @item A symbol selects the test that the symbol names.
-@item @code{(member TESTS...)} selects TESTS, a list of tests or symbols naming tests.
+@item @code{(member TESTS...)} selects the elements of TESTS, a list of
+tests or symbols naming tests.
 @item @code{(eql TEST)} selects TEST, a test or a symbol naming a test.
 @item @code{(and SELECTORS...)} selects the tests that match all SELECTORS.
 @item @code{(or SELECTORS...)} selects the tests that match any SELECTOR.
 @item @code{(not SELECTOR)} selects all tests that do not match SELECTOR.
 @item @code{(tag TAG)} selects all tests that have TAG on their tags list.
-@item @code{(satisfies PREDICATE)} Selects all tests that satisfy PREDICATE.
+(Tags are optional labels you can apply to tests when you define them.)
+@item @code{(satisfies PREDICATE)} selects all tests that satisfy PREDICATE,
+a function that takes a test as argument and returns non-nil if it is selected.
 @end itemize
 
 Selectors that are frequently useful when selecting tests to run
 include @code{t} to run all tests that are currently defined in Emacs,
-@code{"^foo-"} to run all tests in package @code{foo} --- this assumes
-that package @code{foo} uses the prefix @code{foo-} for its test names
----, result-based selectors such as @code{(or :new :unexpected)} to
+@code{"^foo-"} to run all tests in package @code{foo} (this assumes
+that package @code{foo} uses the prefix @code{foo-} for its test names),
+result-based selectors such as @code{(or :new :unexpected)} to
 run all tests that have either not run yet or that had an unexpected
 result in the last run, and tag-based selectors such as @code{(not
 (tag :causes-redisplay))} to run all tests that are not tagged
@@ -325,9 +330,9 @@ to find where a test was defined if the test was loaded from a file.
 
 
 @menu
-* The @code{should} Macro::     A powerful way to express assertions.
+* The @code{should} Macro::          A powerful way to express assertions.
 * Expected Failures::           Tests for known bugs.
-* Tests and Their Environment::  Don't depend on customizations; no side effects.
+* Tests and Their Environment:: Don't depend on customizations; no side effects.
 * Useful Techniques::           Some examples.
 @end menu
 
@@ -335,10 +340,12 @@ to find where a test was defined if the test was loaded from a file.
 @section The @code{should} Macro
 
 Test bodies can include arbitrary code; but to be useful, they need to
-have checks whether the code being tested (or @emph{code under test})
+check whether the code being tested (or @emph{code under test})
 does what it is supposed to do.  The macro @code{should} is similar to
-@code{assert} from the cl package, but analyzes its argument form and
-records information that ERT can display to help debugging.
+@code{assert} from the cl package
+(@pxref{Assertions,,, cl, Common Lisp Extensions}),
+but analyzes its argument form and records information that ERT can
+display to help debugging.
 
 This test definition
 
@@ -396,7 +403,7 @@ default.
 @node Expected Failures, Tests and Their Environment, The @code{should} Macro, How to Write Tests
 @section Expected Failures
 
-Some bugs are complicated to fix or not very important and are left as
+Some bugs are complicated to fix, or not very important, and are left as
 @emph{known bugs}.  If there is a test case that triggers the bug and
 fails, ERT will alert you of this failure every time you run all
 tests.  For known bugs, this alert is a distraction.  The way to
@@ -406,7 +413,7 @@ definition:
 @lisp
 (ert-deftest future-bug ()
   "Test `time-forward' with negative arguments.
-Since this functionality isn't implemented yet, the test is known to fail."
+Since this functionality isn't implemented, the test is known to fail."
   :expected-result :failed
   (time-forward -1))
 @end lisp
@@ -427,7 +434,7 @@ makes it much easier to fix the bug, demonstrate that it is fixed, and
 prevent future regressions.
 
 ERT displays the same kind of alerts for tests that pass unexpectedly
-that it displays for unexpected failures.  This way, if you make code
+as it displays for unexpected failures.  This way, if you make code
 changes that happen to fix a bug that you weren't aware of, you will
 know to remove the @code{:expected-result} clause of that test and
 close the corresponding bug report, if any.
@@ -453,8 +460,8 @@ The outcome of running a test should not depend on the current state
 of the environment, and each test should leave its environment in the
 same state it found it in.  In particular, a test should not depend on
 any Emacs customization variables or hooks, and if it has to make any
-changes to Emacs' state or state external to Emacs such as the file
-system, it should undo these changes before it returns, regardless of
+changes to Emacs's state or state external to Emacs (such as the file
+system), it should undo these changes before it returns, regardless of
 whether it passed or failed.
 
 Tests should not depend on the environment because any such
@@ -462,14 +469,14 @@ dependencies can make the test brittle or lead to failures that occur
 only under certain circumstances and are hard to reproduce.  Of
 course, the code under test may have settings that affect its
 behavior.  In that case, it is best to make the test @code{let}-bind
-all such settings variables to set up a specific configuration for the
+all such setting variables to set up a specific configuration for the
 duration of the test.  The test can also set up a number of different
 configurations and run the code under test with each.
 
 Tests that have side effects on their environment should restore it to
 its original state because any side effects that persist after the
 test can disrupt the workflow of the programmer running the tests.  If
-the code under test has side effects on Emacs' current state, such as
+the code under test has side effects on Emacs's current state, such as
 on the current buffer or window configuration, the test should create
 a temporary buffer for the code to manipulate (using
 @code{with-temp-buffer}), or save and restore the window configuration
@@ -490,13 +497,13 @@ such commands are what they want to test.  The exact behavior of
 @code{auto-mode-alist}.  It is difficult to write a meaningful test if
 its behavior can be affected by so many external factors.  Also,
 @code{find-file} has side effects that are hard to predict and thus
-hard to undo: It may create a new buffer or may reuse an existing
+hard to undo: It may create a new buffer or reuse an existing
 buffer if one is already visiting the requested file; and it runs
 @code{find-file-hook}, which can have arbitrary side effects.
 
 Instead, it is better to use lower-level mechanisms with simple and
 predictable semantics like @code{with-temp-buffer}, @code{insert} or
-@code{insert-file-contents-literally}, and activating the desired mode
+@code{insert-file-contents-literally}, and to activate any desired mode
 by calling the corresponding function directly --- after binding the
 hook variables to nil.  This avoids the above problems.
 
@@ -534,8 +541,10 @@ Here's a more complicated test:
         (ert--print-backtrace (ert-test-failed-backtrace result))
         (goto-char (point-min))
         (end-of-line)
-        (let ((first-line (buffer-substring-no-properties (point-min) (point))))
-          (should (equal first-line "  signal(ert-test-failed (\"foo\"))")))))))
+        (let ((first-line (buffer-substring-no-properties
+                           (point-min) (point))))
+          (should (equal first-line
+                         "  signal(ert-test-failed (\"foo\"))")))))))
 @end lisp
 
 This test creates a test object using @code{make-ert-test} whose body
@@ -562,7 +571,7 @@ under test was structured with testing in mind.
 For example, if @code{ert-run-test} accepted only symbols that name
 tests rather than test objects, the test would need a name for the
 failing test, which would have to be a temporary symbol generated with
-@code{make-symbol}, to avoid side effects on Emacs' state.  Choosing
+@code{make-symbol}, to avoid side effects on Emacs's state.  Choosing
 the right interface for @code{ert-run-tests} allows the test to be
 simpler.
 
@@ -663,7 +672,7 @@ function registered.  @xref{Defining Explanation Functions}.
 @node Interactive Debugging,  , Understanding Explanations, How to Debug Tests
 @section Interactive Debugging
 
-Debugging failed tests works essentially the same way as debugging any
+Debugging failed tests essentially works the same way as debugging any
 other problems with Lisp code.  Here are a few tricks specific to
 tests:
 
@@ -673,8 +682,8 @@ each time.  It's good to find out whether the behavior is
 deterministic before spending any time looking for a cause.  In the
 ERT results buffer, @kbd{r} re-runs the selected test.
 
-@item Use @kbd{.} to jump to the source code of the test to find out what
-exactly it does.  Perhaps the test is broken rather than the code
+@item Use @kbd{.} to jump to the source code of the test to find out exactly
+what it does.  Perhaps the test is broken rather than the code
 under test.
 
 @item If the test contains a series of @code{should} forms and you can't
@@ -699,8 +708,8 @@ re-run the test with @kbd{r} or @kbd{d}.
 @item If you have been editing and rearranging tests, it is possible that
 ERT remembers an old test that you have since renamed or removed ---
 renamings or removals of definitions in the source code leave around a
-stray definition under the old name in the running process, this is a
-common problem in Lisp.  In such a situation, hit @kbd{D} to let ERT
+stray definition under the old name in the running process (this is a
+common problem in Lisp).  In such a situation, hit @kbd{D} to let ERT
 forget about the obsolete test.
 @end itemize
 
@@ -739,14 +748,13 @@ explanation function.
 
 Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch}
 are implemented on top of the lower-level test handling code in the
-sections named ``Facilities for running a single test'', ``Test
-selectors'', and ``Facilities for running a whole set of tests''.
+sections of @file{ert.el} labelled ``Facilities for running a single test'',
+``Test selectors'', and ``Facilities for running a whole set of tests''.
 
 If you want to write code that works with ERT tests, you should take a
 look at this lower-level code.  Symbols that start with @code{ert--}
-are internal to ERT, those that start with @code{ert-} but not
-@code{ert--} are meant to be usable by other code.  But there is no
-mature API yet.
+are internal to ERT, whereas those that start with @code{ert-} are
+meant to be usable by other code.  But there is no mature API yet.
 
 Contributions to ERT are welcome.
 
@@ -758,8 +766,8 @@ For information on mocks, stubs, fixtures, or test suites, see below.
 
 
 @menu
-* Mocks and Stubs::             Stubbing out code that is irrelevant to the test.
-* Fixtures and Test Suites::    How ERT differs from tools for other languages.
+* Mocks and Stubs::           Stubbing out code that is irrelevant to the test.
+* Fixtures and Test Suites::  How ERT differs from tools for other languages.
 @end menu
 
 @node Mocks and Stubs, Fixtures and Test Suites, Other Testing Concepts, Other Testing Concepts
@@ -782,8 +790,8 @@ In many ways, ERT is similar to frameworks for other languages like
 SUnit or JUnit.  However, two features commonly found in such
 frameworks are notably absent from ERT: fixtures and test suites.
 
-Fixtures, as used e.g. in SUnit or JUnit, are mainly used to provide
-an environment for a set of tests, and consist of set-up and tear-down
+Fixtures are mainly used (e.g., in SUnit or JUnit) to provide an
+environment for a set of tests, and consist of set-up and tear-down
 functions.
 
 While fixtures are a useful syntactic simplification in other
@@ -829,13 +837,13 @@ separating module namespaces in Emacs Lisp, test selectors already
 solve this by allowing regexp matching on test names; e.g., the
 selector "^ert-" selects ERT's self-tests.
 
-Other uses include grouping tests by their expected execution time to
-run quick tests during interactive development and slow tests less
-frequently.  This can be achieved with the @code{:tag} argument to
+Other uses include grouping tests by their expected execution time,
+e.g. to run quick tests during interactive development and slow tests less
+often.  This can be achieved with the @code{:tag} argument to
 @code{ert-deftest} and @code{tag} test selectors.
 
 @bye
 
-@c  LocalWords:  ERT Hagelberg Ohler JUnit namespace docstring ERT's
+@c  LocalWords:  ERT JUnit namespace docstring ERT's
 @c  LocalWords:  backtrace makefiles workflow backtraces API SUnit
 @c  LocalWords:  subexpressions
diff --git a/etc/NEWS b/etc/NEWS
index b9fed18355d..386462fe92e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -459,16 +459,16 @@ bound to M-=, which shows the number of lines, words, and characters.
 also deletes newlines around point.
 
 ** Deletion changes
-
++++
 *** New option `delete-active-region'.
 If non-nil, [delete] and DEL delete the region if it is active and no
 prefix argument is given.  If set to `kill', these commands kill
 instead.
-
++++
 *** New command `delete-forward-char', bound to [delete].
 This is meant for interactive use, and obeys `delete-active-region'.
 The command `delete-char' does not obey `delete-active-region'.
-
+---
 *** `delete-backward-char' is now a Lisp function.
 Apart from obeying `delete-active-region', its behavior is unchanged.
 However, the byte compiler now warns if it is called from Lisp; you
@@ -537,6 +537,7 @@ between applications.
 *** X clipboard managers are now supported.
 To inhibit this, change `x-select-enable-clipboard-manager' to nil.
 
++++
 ** New command `rectangle-number-lines', bound to `C-x r N', numbers
 the lines in the current rectangle.  With a prefix argument, this
 prompts for a number to count from and for a format string.
@@ -947,6 +948,7 @@ variable `menu-bar-mode'/`tool-bar-mode' to determine whether to create
 a menu-bar or tool-bar, respectively.  If the alist entries are added,
 they override the value of `menu-bar-mode'/`tool-bar-mode'.
 
++++
 ** Regions created by mouse dragging are now normal active regions,
 similar to the ones created by shift-selection.  In previous Emacs
 versions, these regions were delineated by `mouse-drag-overlay', which
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10570c2a878..68a85a43387 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
+
+        * textmodes/flyspell.el (flyspell-large-region): Make sure
+        extended character mode is used if defined (Bug#1339).
+
 2011-10-13  Eli Zaretskii  <eliz@gnu.org>
 
         * simple.el (what-cursor-position): Fix the display of the
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index c2af3f7be84..d496298768d 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1559,6 +1559,14 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
                         (list "-p"
                               (expand-file-name
                                ispell-current-personal-dictionary)))))
+
+      ;; Check for extended character mode
+      (let ((extended-char-mode (ispell-get-extended-character-mode)))
+        (and extended-char-mode          ; ~ extended character mode
+             (string-match "[^~]+$" extended-char-mode)
+             (add-to-list 'args (concat "-T" (match-string 0 extended-char-mode)))))
+
+      ;; Add ispell-extra-args
       (setq args (append args ispell-extra-args))
 
       ;; If we are using recent aspell or hunspell, make sure we use the right encoding
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 7e332a9fd5d..3b494865f0c 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with
+        xfree to avoid crash when xmalloc overrun checking is enabled.
+        * lwlib-Xm.c (free_destroyed_instance, xm_update_one_value): Ditto.
+        * lwlib-utils.c (XtApplyToWidgets): Ditto.
+        * lwlib.c (safe_free_str, free_widget_value, free_widget_value_tree)
+        (free_widget_info, free_widget_instance, name_to_widget): Ditto.
+        * xlwmenu.c (openXftFont): Ditto.
+
 2011-06-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * Makefile.in (ALL_CFLAGS): Add -I../lib for generated header files
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 9c9a007bc15..0eea0aba7b6 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -136,7 +136,7 @@ openFont (Widget widget, char *name)
     }
 
   fn = XftFontOpenName (XtDisplay (widget), screen, fname);
-  if (fname != name) free (fname);
+  if (fname != name) xfree (fname);
 
   return fn;
 }
@@ -384,7 +384,7 @@ xaw_destroy_instance (widget_instance *instance)
       if (instance->xft_data[0].xft_font)
         XftFontClose (XtDisplay (instance->widget),
                       instance->xft_data[0].xft_font);
-      free (instance->xft_data);
+      xfree (instance->xft_data);
     }
 #endif
   if (XtIsSubclass (instance->widget, dialogWidgetClass))
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 2b7677a02f5..058e2e779c7 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -186,9 +186,9 @@ make_destroyed_instance (char* name,
 static void
 free_destroyed_instance (destroyed_instance* instance)
 {
-  free (instance->name);
-  free (instance->type);
-  free (instance);
+  xfree (instance->name);
+  xfree (instance->type);
+  xfree (instance);
 }
 
 /* motif utility functions */
@@ -928,13 +928,13 @@ xm_update_one_value (widget_instance* instance,
     }
   else if (class == xmTextWidgetClass)
     {
-      free (val->value);
+      xfree (val->value);
       val->value = XmTextGetString (widget);
       val->edited = True;
     }
   else if (class == xmTextFieldWidgetClass)
     {
-      free (val->value);
+      xfree (val->value);
       val->value = XmTextFieldGetString (widget);
       val->edited = True;
     }
@@ -959,7 +959,7 @@ xm_update_one_value (widget_instance* instance,
               XtVaGetValues (toggle, XmNset, &set, NULL);
               if (set)
                 {
-                  free (val->value);
+                  xfree (val->value);
                   val->value = safe_strdup (XtName (toggle));
                 }
             }
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 7a0dd1b264a..fe236a210f3 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -80,7 +80,7 @@ XtApplyToWidgets (Widget w, XtApplyToWidgetsProc proc, XtPointer arg)
             XtApplyToWidgets (kids [i], proc, arg);
             proc (kids [i], arg);
           }
-      free (kids);
+      xfree (kids);
     }
 }
 
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 9d8ec3330d3..7e3538aec04 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -138,7 +138,7 @@ my_strcasecmp (const char *s1, const char *s2)
 static void
 safe_free_str (char *s)
 {
-  free (s);
+  xfree (s);
 }
 
 static widget_value *widget_value_free_list = 0;
@@ -176,7 +176,7 @@ free_widget_value (widget_value *wv)
     {
       /* When the number of already allocated cells is too big,
          We free it.  */
-      free (wv);
+      xfree (wv);
       malloc_cpt--;
     }
   else
@@ -192,9 +192,9 @@ free_widget_value_tree (widget_value *wv)
   if (!wv)
     return;
 
-  free (wv->name);
-  free (wv->value);
-  free (wv->key);
+  xfree (wv->name);
+  xfree (wv->value);
+  xfree (wv->key);
 
   wv->name = wv->value = wv->key = (char *) 0xDEADBEEF;
 
@@ -281,7 +281,7 @@ free_widget_info (widget_info *info)
   safe_free_str (info->name);
   free_widget_value_tree (info->val);
   memset ((void*)info, 0xDEADBEEF, sizeof (widget_info));
-  free (info);
+  xfree (info);
 }
 
 static void
@@ -317,7 +317,7 @@ static void
 free_widget_instance (widget_instance *instance)
 {
   memset ((void*)instance, 0xDEADBEEF, sizeof (widget_instance));
-  free (instance);
+  xfree (instance);
 }
 
 static widget_info *
@@ -602,7 +602,7 @@ name_to_widget (widget_instance *instance, const char *name)
 
       widget = XtNameToWidget (instance->widget, real_name);
 
-      free (real_name);
+      xfree (real_name);
     }
   return widget;
 }
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index e9ec604ae7f..5ed33d5be05 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1891,7 +1891,7 @@ openXftFont (XlwMenuWidget mw)
         }
     }
 
-  if (fname != mw->menu.fontName) free (fname);
+  if (fname != mw->menu.fontName) xfree (fname);
 
   return mw->menu.xft_font != 0;
 }
diff --git a/src/ChangeLog b/src/ChangeLog
index e7cd83305ee..52fe8baa92e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * editfns.c (Fset_time_zone_rule): Replace free with xfree to
+        avoid crash when xmalloc overrun checking is enabled.
+
 2011-10-13  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
diff --git a/src/editfns.c b/src/editfns.c
index 3dd58377ada..5f89391ce22 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2079,7 +2079,7 @@ only the former.  */)
     }
 
   set_time_zone_rule (tzstring);
-  free (environbuf);
+  xfree (environbuf);
   environbuf = environ;
 
   return Qnil;