upstream

69 files changed, 1992 insertions, 1505 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e76c91b196..52aa133f8e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-10-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, fixing some 'configure' typos (Bug#9696).
+        * lib/signal.in.h, lib/sigprocmask.c, m4/gl-comp.m4:
+        * m4/gnulib-common.m4: Merge from gnulib.
+        Without this, 'configure' would say "func_gl_gnulib_m4code_pathmax:
+        command not found" on powerpc-apple-darwin9.8.0.
+
+        * configure.in (GC_LISP_OBJECT_ALIGNMENT): Remove.
+        This is now done by src/alloc.c.
+
+2011-10-02  Richard Stallman  <rms@gnu.org>
+
+        * configure.in: Rename xlinux_first_failure to xgnu_linux_first_failure
+        and xlinux_second_failure to xgnu_linux_second_failure.
+
 2011-09-29  Eli Zaretskii  <eliz@gnu.org>
 
         * .bzrignore: Add ./GNUmakefile.unix, lib/SYS, lib/alloca.in-h,
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index e1c25ef07f3..4481d8cd93b 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -158,7 +158,7 @@ building.texi
 calendar.texi     
 cal-xtra.texi     
 cmdargs.texi      
-commands.texi     
+commands.texi     cyd
 custom.texi       
 dired.texi        
 dired-xtra.texi
@@ -166,7 +166,7 @@ display.texi
 emacs.texi        
 emacs-xtra.texi
 emerge-xtra.texi
-entering.texi     
+entering.texi     cyd
 files.texi        
 fixit.texi        
 fortran-xtra.texi 
@@ -190,7 +190,7 @@ picture-xtra.texi
 programs.texi     
 regs.texi         
 rmail.texi        
-screen.texi       
+screen.texi       cyd
 search.texi       
 sending.texi      
 text.texi         
diff --git a/autogen/config.in b/autogen/config.in
index cbf7c225bd7..fd2c4f8eda5 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1473,9 +1473,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   /* GC_SETJMP_WORKS is nearly always appropriate for GCC.  */
 #    define GC_SETJMP_WORKS 1
 #  endif
-#  ifndef GC_LISP_OBJECT_ALIGNMENT
-#    define GC_LISP_OBJECT_ALIGNMENT (__alignof__ (Lisp_Object))
-#  endif
 #endif
 
 #endif /* EMACS_CONFIG_H */
diff --git a/autogen/configure b/autogen/configure
index 7a4a3c10bdc..29fcb81a452 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7040,6 +7040,8 @@ esac
   # Code from module stat:
   # Code from module stdarg:
 
+
+
   # Code from module stdbool:
   # Code from module stddef:
   # Code from module stdint:
@@ -10781,13 +10783,13 @@ XOpenDisplay ("foo");
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  xlinux_first_failure=no
+  xgnu_linux_first_failure=no
 else
-  xlinux_first_failure=yes
+  xgnu_linux_first_failure=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    if test "${xlinux_first_failure}" = "yes"; then
+    if test "${xgnu_linux_first_failure}" = "yes"; then
       OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
       OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
       OLD_CPPFLAGS="$CPPFLAGS"
@@ -10808,13 +10810,13 @@ XOpenDisplay ("foo");
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  xlinux_second_failure=no
+  xgnu_linux_second_failure=no
 else
-  xlinux_second_failure=yes
+  xgnu_linux_second_failure=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      if test "${xlinux_second_failure}" = "yes"; then
+      if test "${xgnu_linux_second_failure}" = "yes"; then
         # If we get the same failure with -b, there is no use adding -b.
         # So take it out.  This plays safe.
         LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"
@@ -22141,10 +22143,14 @@ fi
 
 
       gl_gnulib_enabled_stat=true
-      if $condition; then
+      if test $REPLACE_STAT = 1; then
         func_gl_gnulib_m4code_dosname
       fi
+<<<<<<< TREE
       if $condition; then
+=======
+      if test $REPLACE_STAT = 1; then
+>>>>>>> MERGE-SOURCE
         func_gl_gnulib_m4code_verify
       fi
     fi
diff --git a/configure.in b/configure.in
index e90ee4e5397..0accb3bc4c8 100644
--- a/configure.in
+++ b/configure.in
@@ -1794,9 +1794,9 @@ if test "${HAVE_X11}" = "yes"; then
     AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link)
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
      [[XOpenDisplay ("foo");]])],
-     [xlinux_first_failure=no],
-     [xlinux_first_failure=yes])
-    if test "${xlinux_first_failure}" = "yes"; then
+     [xgnu_linux_first_failure=no],
+     [xgnu_linux_first_failure=yes])
+    if test "${xgnu_linux_first_failure}" = "yes"; then
       OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
       OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
       OLD_CPPFLAGS="$CPPFLAGS"
@@ -1807,9 +1807,9 @@ if test "${HAVE_X11}" = "yes"; then
       LIBS="$LIBS -b i486-linuxaout"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
        [[XOpenDisplay ("foo");]])],
-       [xlinux_second_failure=no],
-       [xlinux_second_failure=yes])
-      if test "${xlinux_second_failure}" = "yes"; then
+       [xgnu_linux_second_failure=no],
+       [xgnu_linux_second_failure=yes])
+      if test "${xgnu_linux_second_failure}" = "yes"; then
         # If we get the same failure with -b, there is no use adding -b.
         # So take it out.  This plays safe.
         LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"
@@ -3713,9 +3713,6 @@ AH_BOTTOM([
   /* GC_SETJMP_WORKS is nearly always appropriate for GCC.  */
 #    define GC_SETJMP_WORKS 1
 #  endif
-#  ifndef GC_LISP_OBJECT_ALIGNMENT
-#    define GC_LISP_OBJECT_ALIGNMENT (__alignof__ (Lisp_Object))
-#  endif
 #endif
 
 #endif /* EMACS_CONFIG_H */
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7d883a6eb91..6adbe95cc97 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,76 @@
+2011-10-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * help.texi (Help, Help Summary): Eliminate the unnecessary "help
+        option" terminology.
+        (Key Help): Add command names.  Define "documentation string".
+        (Name Help): Remove an over-long joke.
+        (Apropos): Document prefix args.  Remove duplicated descriptions.
+        (Help Mode): Add C-c C-b to table.  Update TAB binding.
+        (Package Keywords): Rename from "Library by Keyword".  Describe
+        new package menu interface.
+        (Help Files, Help Echo): Tweak description.
+
+        * mini.texi (Completion Options): Add completion-cycle-threshold.
+        (Minibuffer History): Document numeric args to history commands.
+
+2011-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * mule.texi (Bidirectional Editing): Correct some inaccuracies.
+
+2011-10-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * basic.texi (Position Info): Omit page commands.  Document
+        count-words-region and count-words.
+
+        * text.texi (Pages): Move what-page documentation here.
+
+2011-10-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mini.texi (Minibuffer File): Minor copyedits.  Use xref to
+        Remote Files node instead of linking directly to the Tramp manual.
+        (Minibuffer Edit): Add xref to Blank Lines.
+        (Completion): Add xref to Symbol Completion.  Remove redundant
+        example, which is repeated in the next node.
+        (Completion Commands): Minor clarifications.
+        (Completion Styles): New node, split from Completion Commands.
+        Document substring and initials styles.
+        (Strict Completion): Remove information duplicated in other nodes.
+        (Completion Options): Consolidate case difference discussion here.
+
+        * help.texi (Help Mode): Fix kindex entries.
+
+        * files.texi (File Names): Add index entries.
+
+2011-10-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * basic.texi (Inserting Text): Add xref to Completion.  Add
+        ucs-insert example, and document prefix argument.
+        (Moving Point): Fix introduction; C-f/C-b are no longer equivalent
+        to left/right.  Tweak left-char and right-char descriptions.
+        M-left and M-right are now bound to left-word/right-word.
+        (Erasing): Document delete-forward-char.
+
+        * screen.texi (Screen, Menu Bar): Copyedits.
+        (Point): Remove duplicate paragraph on cursors, also in Screen.
+        (Mode Line): Trailing dashes no longer shown on X displays.
+
+        * frames.texi (Non-Window Terminals): Index just "text-only
+        terminal", which is used throughout the manual now.
+
+        * entering.texi (Entering Emacs): Define "startup screen".
+        Document window-splitting behavior with command-line inputs.
+        (Exiting): Remove obsolete paragraph about shells without suspend
+        functionality.
+
+        * commands.texi (User Input): Define "input event" more clearly.
+        (Keys): Add xref to Echo Area.
+        (Commands): Clarify relation between commands and functions.
+
+2011-10-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * misc.texi (emacsclient Options): Document how emacsclient runs
+        the Emacs daemon (Bug#9674).
+
 2011-10-01  Chong Yidong  <cyd@stupidchicken.com>
 
         * basic.texi (Moving Point):
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 8c8708a3b51..e4e7dadd548 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -10,7 +10,7 @@
   Here we explain the basics of how to enter text, make corrections,
 and save the text in a file.  If this material is new to you, we
 suggest you first run the Emacs learn-by-doing tutorial, by typing
-@kbd{Control-h t} inside Emacs.  (@code{help-with-tutorial}).
+@kbd{C-h t} (@code{help-with-tutorial}).
 
 @menu
 
@@ -23,7 +23,7 @@ suggest you first run the Emacs learn-by-doing tutorial, by typing
 * Help: Basic Help.     Asking what a character does.
 * Blank Lines::         Making and deleting blank lines.
 * Continuation Lines::  How Emacs displays lines too wide for the screen.
-* Position Info::       What page, line, row, or column is point on?
+* Position Info::       What line, row, or column is point on?
 * Arguments::           Numeric arguments for repeating a command N times.
 * Repeating::           Repeating the previous command quickly.
 @end menu
@@ -41,20 +41,20 @@ forward, so that point remains just after the inserted text.
 
 @kindex RET
 @cindex newline
-  To end a line and start a new one, type @key{RET}.  This key may be
-labeled @key{Return} or @key{Enter} on your keyboard, but we refer to
-it as @key{RET} in this manual.  Pressing it inserts a newline
-character in the buffer.  If point is at the end of the line, this
-creates a new blank line after it; if point is in the middle of a
-line, the line is split at that position.
+  To end a line and start a new one, type @key{RET} (@code{newline}).
+(The @key{RET} key may be labeled @key{Return} or @key{Enter} on your
+keyboard, but we refer to it as @key{RET} in this manual.)  This
+command inserts a newline character into the buffer.  If point is at
+the end of the line, the effect is to create a new blank line after
+it; if point is in the middle of a line, the line is split at that
+position.
 
   As we explain later in this manual, you can change the way Emacs
 handles text insertion by turning on @dfn{minor modes}.  For instance,
-if you turn on a minor mode called @dfn{Auto Fill} mode, Emacs can
-split lines automatically when they become too long (@pxref{Filling}).
-If you turn on a minor mode called @dfn{Overwrite} mode, inserted
-characters replace (overwrite) existing text, instead of shoving it to
-the right.  @xref{Minor Modes}.
+the minor mode called Auto Fill mode splits lines automatically when
+they get too long (@pxref{Filling}).  The minor mode called Overwrite
+mode causes inserted characters to replace (overwrite) existing text,
+instead of shoving it to the right.  @xref{Minor Modes}.
 
 @cindex quoting
 @kindex C-q
@@ -80,9 +80,10 @@ literal @samp{DEL} character.
 @kbd{C-q} followed by a sequence of octal digits inserts the character
 with the specified octal character code.  You can use any number of
 octal digits; any non-digit terminates the sequence.  If the
-terminating character is @key{RET}, it serves only to terminate the
-sequence.  Any other non-digit terminates the sequence and then acts
-as normal input---thus, @kbd{C-q 1 0 1 B} inserts @samp{AB}.
+terminating character is @key{RET}, that @key{RET} serves only to
+terminate the sequence.  Any other non-digit terminates the sequence
+and then acts as normal input---thus, @kbd{C-q 1 0 1 B} inserts
+@samp{AB}.
 
 The use of octal sequences is disabled in ordinary non-binary
 Overwrite mode, to give you a convenient way to insert a digit instead
@@ -96,21 +97,28 @@ To use decimal or hexadecimal instead of octal, set the variable
 the letters @kbd{a} to @kbd{f} serve as part of a character code,
 just like digits.  Case is ignored.
 
-  A numeric argument tells @kbd{C-q} how many copies of the quoted
-character to insert (@pxref{Arguments}).
-
 @findex ucs-insert
 @kindex C-x 8 RET
 @cindex Unicode characters, inserting
 @cindex insert Unicode character
 @cindex characters, inserting by name or code-point
-  Instead of @kbd{C-q}, you can use @kbd{C-x 8 @key{RET}}
-(@code{ucs-insert}) to insert a character based on its Unicode name or
-code-point.  This command prompts for a character to insert, using
-the minibuffer; you can specify the character using either (i) the
-character's name in the Unicode standard, or (ii) the character's
-code-point in the Unicode standard.  If you specify the character's
-name, the command provides completion.
+  Instead of @kbd{C-q}, you can use the command @kbd{C-x 8 @key{RET}}
+(@code{ucs-insert}).  This prompts for the Unicode name or code-point
+of a character, using the minibuffer.  If you enter a name, the
+command provides completion (@pxref{Completion}).  If you enter a
+code-point, it should be a hexadecimal number (which is the convention
+for Unicode).  The command then inserts the corresponding character
+into the buffer.  For example, both of the following insert the
+infinity sign (Unicode code-point @code{#x221E}):
+
+@example
+@kbd{C-x 8 @key{RET} infinity @key{RET}}
+@kbd{C-x 8 @key{RET} 221e @key{RET}}
+@end example
+
+  A numeric argument to either @kbd{C-q} or @kbd{C-x 8 @key{RET}}
+specifies how many copies of the character to insert
+(@pxref{Arguments}).
 
 @node Moving Point
 @section Changing the Location of Point
@@ -123,85 +131,104 @@ name, the command provides completion.
   To do more than insert characters, you have to know how to move
 point (@pxref{Point}).  The keyboard commands @kbd{C-f}, @kbd{C-b},
 @kbd{C-n}, and @kbd{C-p} move point to the right, left, up and down
-respectively.  These are equivalent to the commands @kbd{@key{right}},
-@kbd{@key{left}}, @kbd{@key{down}}, and @kbd{@key{up}}, entered using
-the @dfn{arrow keys} present on many keyboards.  Many Emacs users find
-that it is slower to use the arrow keys than the equivalent control
-keys.  You can also click the left mouse button to move point to the
+respectively.  You can also move point using the @dfn{arrow keys}
+present on most keyboards: @kbd{@key{right}}, @kbd{@key{left}},
+@kbd{@key{down}}, and @kbd{@key{up}}; however, many Emacs users find
+that it is slower to use the arrow keys than the control keys.
+
+  You can also click the left mouse button to move point to the
 position clicked.  Emacs also provides a variety of additional
 keyboard commands that move point in more sophisticated ways.
 
-@kindex C-a
-@kindex C-e
+@table @kbd
+
+@item C-f
 @kindex C-f
-@kindex C-b
-@kindex C-n
-@kindex C-p
-@kindex M->
-@kindex M-<
-@kindex M-r
-@kindex LEFT
-@kindex RIGHT
-@kindex UP
-@kindex DOWN
-@findex move-beginning-of-line
-@findex move-end-of-line
 @findex forward-char
-@findex backward-char
+Move forward one character (@code{forward-char}).
+
+@item @key{right}
+@kindex RIGHT
 @findex right-char
+This command (@code{right-char}) behaves like @kbd{C-f}, with one
+exception: when editing right-to-left scripts such as Arabic, it
+instead moves @emph{backward} if the current paragraph is a
+right-to-left paragraph.  @xref{Bidirectional Editing}.
+
+@item C-b
+@kindex C-b
+@findex backward-char
+Move backward one character (@code{backward-char}).
+
+@item @key{left}
+@kindex LEFT
 @findex left-char
+This command (@code{left-char}) behaves like @kbd{C-b}, except it
+moves @emph{forward} if the current paragraph is right-to-left.
+@xref{Bidirectional Editing}.
+
+@item C-n
+@itemx @key{down}
+@kindex C-n
+@kindex DOWN
 @findex next-line
+Move down one screen line (@code{next-line}).  This command attempts
+to keep the horizontal position unchanged, so if you start in the
+middle of one line, you move to the middle of the next.
+
+@item C-p
+@itemx @key{up}
+@kindex C-p
+@kindex UP
 @findex previous-line
-@findex beginning-of-buffer
-@findex end-of-buffer
-@findex goto-char
-@findex goto-line
-@findex move-to-window-line
-@table @kbd
+Move up one screen line (@code{previous-line}).  This command
+preserves position within the line, like @kbd{C-n}.
+
 @item C-a
 @itemx @key{Home}
+@kindex C-a
+@kindex HOME
+@findex move-beginning-of-line
 Move to the beginning of the line (@code{move-beginning-of-line}).
+
 @item C-e
 @itemx @key{End}
+@kindex C-e
+@kindex END
+@findex move-end-of-line
 Move to the end of the line (@code{move-end-of-line}).
-@item C-f
-Move forward one character (@code{forward-char}).
-@item @key{right}
-Move one character to the right (@code{right-char}).  This
-moves one character forward in text that is read in the usual
-left-to-right direction, but one character @emph{backward} if the text
-is read right-to-left, as needed for right-to-left scripts such as
-Arabic.  @xref{Bidirectional Editing}.
-@item C-b
-Move backward one character (@code{backward-char}).
-@item @key{left}
-Move one character to the left (@code{left-char}).  This
-moves one character backward in left-to-right text and one character
-forward in right-to-left text.
+
 @item M-f
-@itemx M-@key{right}
+@kindex M-f
+@findex forward-word
 Move forward one word (@code{forward-word}).
+
 @item C-@key{right}
-Move one word to the right (@code{right-word}).  This moves one word
-forward in left-to-right text and one word backward in right-to-left
-text.
+@itemx M-@key{right}
+@kindex C-RIGHT
+@kindex M-RIGHT
+@findex right-word
+This command (@code{right-word}) behaves like @kbd{M-f}, except it
+moves @emph{backward} by one word if the current paragraph is
+right-to-left.  @xref{Bidirectional Editing}.
+
 @item M-b
-@itemx M-@key{left}
+@kindex M-b
+@findex backward-word
 Move backward one word (@code{backward-word}).
+
 @item C-@key{left}
-Move one word to the left (@code{left-word}).  This moves one word
-backward in left-to-right text and one word forward in right-to-left
-text.
-@item C-n
-@itemx @key{down}
-Move down one screen line (@code{next-line}).  This command attempts
-to keep the horizontal position unchanged, so if you start in the
-middle of one line, you move to the middle of the next.
-@item C-p
-@itemx @key{up}
-Move up one screen line (@code{previous-line}).  This command
-preserves position within the line, like @kbd{C-n}.
+@itemx M-@key{left}
+@kindex C-LEFT
+@kindex M-LEFT
+@findex left-word
+This command (@code{left-word}) behaves like @kbd{M-f}, except it
+moves @emph{forward} by one word if the current paragraph is
+right-to-left.  @xref{Bidirectional Editing}.
+
 @item M-r
+@kindex M-r
+@findex move-to-window-line-top-bottom
 Without moving the text on the screen, reposition point on the left
 margin of the center-most text line of the window; on subsequent
 consecutive invocations, move point to the left margin of the top-most
@@ -211,13 +238,18 @@ line, the bottom-most line, and so forth, in cyclic order
 A numeric argument says which screen line to place point on, counting
 downward from the top of the window (zero means the top line).  A
 negative argument counts lines up from the bottom (@minus{}1 means the
-bottom line).
+bottom line).  @xref{Arguments}, for more information on numeric
+arguments.
 
 @item M-<
+@kindex M-<
+@findex beginning-of-buffer
 Move to the top of the buffer (@code{beginning-of-buffer}).  With
 numeric argument @var{n}, move to @var{n}/10 of the way from the top.
-@xref{Arguments}, for more information on numeric arguments.@refill
+
 @item M->
+@kindex M->
+@findex end-of-buffer
 Move to the end of the buffer (@code{end-of-buffer}).
 
 @item C-v
@@ -233,10 +265,15 @@ Scroll one screen backward, and move point onscreen if necessary
 (@code{scroll-down-command}).  @xref{Scrolling}.
 
 @item M-x goto-char
+@findex goto-char
 Read a number @var{n} and move point to buffer position @var{n}.
 Position 1 is the beginning of the buffer.
+
 @item M-g M-g
 @itemx M-g g
+@kindex M-g M-g
+@kindex M-g g
+@findex goto-line
 Read a number @var{n} and move point to the beginning of line number
 @var{n} (@code{goto-line}).  Line 1 is the beginning of the buffer.  If
 point is on or just after a number in the buffer, that is the default
@@ -244,14 +281,16 @@ for @var{n}.  Just type @key{RET} in the minibuffer to use it.  You can
 also specify @var{n} by giving @kbd{M-g M-g} a numeric prefix argument.
 @xref{Select Buffer}, for the behavior of @kbd{M-g M-g} when you give it
 a plain prefix argument.
+
 @item C-x C-n
-@findex set-goal-column
 @kindex C-x C-n
+@findex set-goal-column
 Use the current column of point as the @dfn{semipermanent goal column}
 for @kbd{C-n} and @kbd{C-p} (@code{set-goal-column}).  When a
 semipermanent goal column is in effect, those commands always try to
 move to this column, or as close as possible to it, after moving
 vertically.  The goal column remains in effect until canceled.
+
 @item C-u C-x C-n
 Cancel the goal column.  Henceforth, @kbd{C-n} and @kbd{C-p} try to
 preserve the horizontal position, as usual.
@@ -266,9 +305,8 @@ can force these commands to move according to @dfn{logical lines}
 (i.e., according to the text lines in the buffer) by setting the
 variable @code{line-move-visual} to @code{nil}; if a logical line
 occupies multiple screen lines, the cursor then skips over the
-additional screen lines.  Moving by logical lines was the default
-behavior prior to Emacs 23.1.  For details, see @ref{Continuation
-Lines}.  @xref{Variables}, for how to set variables such as
+additional screen lines.  For details, see @ref{Continuation Lines}.
+@xref{Variables}, for how to set variables such as
 @code{line-move-visual}.
 
   Unlike @kbd{C-n} and @kbd{C-p}, most of the Emacs commands that work
@@ -288,21 +326,30 @@ the end of the next logical line.  Normally, @code{track-eol} is
 
 @vindex next-line-add-newlines
   @kbd{C-n} normally stops at the end of the buffer when you use it on
-the last line of the buffer.  However, if you set the variable
+the last line in the buffer.  However, if you set the variable
 @code{next-line-add-newlines} to a non-@code{nil} value, @kbd{C-n} on
 the last line of a buffer creates an additional line at the end and
 moves down into it.
 
 @node Erasing
 @section Erasing Text
+@cindex killing characters and lines
+@cindex deleting characters and lines
+@cindex erasing characters and lines
 
 @table @kbd
 @item @key{DEL}
 @itemx @key{Backspace}
-Delete the character before point (@code{delete-backward-char}).
-@item C-d
+Delete the character before point, or the region if it is active
+(@code{delete-backward-char}).
+
 @itemx @key{Delete}
+Delete the character after point, or the region if it is active
+(@code{delete-forward-char}).
+
+@item C-d
 Delete the character after point (@code{delete-char}).
+
 @item C-k
 Kill to the end of the line (@code{kill-line}).
 @item M-d
@@ -312,37 +359,40 @@ Kill back to the beginning of the previous word
 (@code{backward-kill-word}).
 @end table
 
-   The key @kbd{@key{DEL}} (@code{delete-backward-char}) removes the
-character before point, moving the cursor and all the characters after
-it backwards.  On most keyboards, @key{DEL} is labelled
-@key{Backspace}, but we refer to it as @key{DEL} in this manual.  Do
-not confuse @key{DEL} with another key, labelled @key{Delete}, that
-exists on many keyboards; we will discuss @key{Delete} momentarily.
+  The @kbd{@key{DEL}} (@code{delete-backward-char}) command removes
+the character before point, moving the cursor and the characters after
+it backwards.  If point was at the beginning of a line, this deletes
+the preceding newline, joining this line to the previous one.
 
-  Typing @key{DEL} when the cursor is at the beginning of a line
-deletes the preceding newline character, joining the line with the one
-before it.
+  If, however, the region is active, @kbd{@key{DEL}} instead deletes
+the text in the region.  @xref{Mark}, for a description of the region.
 
-  On some text-only terminals, Emacs may not recognize the @key{DEL}
-key properly.  If @key{DEL} does not do the right thing (e.g., if it
-deletes characters forwards), see @ref{DEL Does Not Delete}.
+  On most keyboards, @key{DEL} is labelled @key{Backspace}, but we
+refer to it as @key{DEL} in this manual.  (Do not confuse @key{DEL}
+with the @key{Delete} key; we will discuss @key{Delete} momentarily.)
+On some text-only terminals, Emacs may not recognize the @key{DEL} key
+properly.  @xref{DEL Does Not Delete}, if you encounter this problem.
 
-@cindex killing characters and lines
-@cindex deleting characters and lines
-@cindex erasing characters and lines
-  The key @kbd{C-d} (@code{delete-char}) deletes the character after
-point, i.e., the character under the cursor.  This shifts the rest of
-the text on the line to the left.  If you type @kbd{C-d} at the end of
-a line, it joins that line with the following line.  This command is
-also bound to the key labelled @key{Delete} on many keyboards.
+  The @key{delete} (@code{delete-forward-char}) command deletes in the
+``opposite direction'': it deletes the character after point, i.e. the
+character under the cursor.  If point was at the end of a line, this
+joins the following line onto this one.  Like @kbd{@key{DEL}}, it
+deletes the text in the region if the region is active (@pxref{Mark}).
+
+  @kbd{C-d} (@code{delete-char}) deletes the character after point,
+similar to @key{delete}, but regardless of whether the region is
+active.
 
-  To erase a larger amount of text, use the @kbd{C-k} key, which
-erases (kills) a line at a time.  If you type @kbd{C-k} at the
-beginning or middle of a line, it kills all the text up to the end of
-the line.  If you type @kbd{C-k} at the end of a line, it joins that
-line with the following line.
+  @xref{Deletion}, for more detailed information about the above
+deletion commands.
 
-  To learn more about killing text, see @ref{Killing}.
+  @kbd{C-k} (@code{kill-line}) erases (kills) a line at a time.  If
+you type @kbd{C-k} at the beginning or middle of a line, it kills all
+the text up to the end of the line.  If you type @kbd{C-k} at the end
+of a line, it joins that line with the following line.
+
+  @xref{Killing}, for more information about @kbd{C-k} and related
+commands.
 
 @node Basic Undo
 @section Undoing Changes
@@ -352,7 +402,7 @@ line with the following line.
 Undo one entry of the undo records---usually, one command worth
 (@code{undo}).
 @itemx C-x u
-@item C-_
+@itemx C-_
 The same.
 @end table
 
@@ -379,10 +429,7 @@ command displays an error message and does nothing.
 
   Text that you insert in an Emacs buffer lasts only as long as the
 Emacs session.  To keep any text permanently, you must put it in a
-@dfn{file}.  Files are named units of text which are stored by the
-operating system for you to retrieve later by name.  To use the
-contents of a file in any way, including editing it with Emacs, you
-must specify the file name.
+@dfn{file}.
 
   Suppose there is a file named @file{test.emacs} in your home
 directory.  To begin editing this file in Emacs, type
@@ -417,14 +464,15 @@ first time you save this buffer with @kbd{C-x C-s}.
 @section Help
 
 @cindex getting help with keys
-  If you forget what a key does, you can find out with the Help
-character, which is @kbd{C-h} (or @key{F1}, which is an alias for
-@kbd{C-h}).  Type @kbd{C-h k}, followed by the key of interest; for
-example, @kbd{C-h k C-n} tells you what @kbd{C-n} does.  @kbd{C-h} is
-a prefix key; @kbd{C-h k} is just one of its subcommands (the command
-@code{describe-key}).  The other subcommands of @kbd{C-h} provide
-different kinds of help.  Type @kbd{C-h} twice to get a description of
-all the help facilities.  @xref{Help}.
+  If you forget what a key does, you can find out by typing @kbd{C-h
+k} (@code{describe-key}), followed by the key of interest; for
+example, @kbd{C-h k C-n} tells you what @kbd{C-n} does.
+
+  The prefix key @kbd{C-h} stands for ``help''.  The key @key{F1}
+serves as an alias for @kbd{C-h}.  Apart from @kbd{C-h k}, there are
+many other help commands providing different kinds of help.
+
+  @xref{Help}, for details.
 
 @node Blank Lines
 @section Blank Lines
@@ -521,23 +569,26 @@ logical lines.  @xref{Visual Line Mode}.
 @section Cursor Position Information
 
   Here are commands to get information about the size and position of
-parts of the buffer, and to count lines.
+parts of the buffer, and to count words and lines.
 
 @table @kbd
-@item M-x what-page
-Display the page number of point, and the line number within that page.
 @item M-x what-line
-Display the line number of point in the whole buffer.
+Display the line number of point.
 @item M-x line-number-mode
 @itemx M-x column-number-mode
 Toggle automatic display of the current line number or column number.
 @xref{Optional Mode Line}.
-@item M-x count-lines-region
-Display the number of lines in the current region.  Normally bound to
-@kbd{M-=}, except in a few specialist modes.  @xref{Mark}, for
-information about the region.
-@item M-x count-words-region
-Display the number of words in the current region.
+
+@item M-=
+Display the number of lines, words, and characters that are present in
+the region (@code{count-words-region}).  @xref{Mark}, for information
+about the region.
+
+@item M-x count-words
+Display the number of lines, words, and characters that are present in
+the buffer.  If the region is active (@pxref{Mark}), display the
+numbers for the region instead.
+
 @item C-x =
 Display the character code of character after point, character position of
 point, and column of point (@code{what-cursor-position}).
@@ -549,7 +600,6 @@ Toggle automatic display of the size of the buffer.
 @xref{Optional Mode Line}.
 @end table
 
-@findex what-page
 @findex what-line
 @cindex line number commands
 @cindex location of point
@@ -563,15 +613,14 @@ the accessible portion (@pxref{Narrowing}).  By contrast,
 @code{what-line} displays both the line number relative to the
 narrowed region and the line number relative to the whole buffer.
 
-  @kbd{M-x what-page} counts pages from the beginning of the file, and
-counts lines within the page, showing both numbers in the echo area.
-@xref{Pages}.
-
 @kindex M-=
-@findex count-lines-region
-  Use @kbd{M-x count-lines-region} (normally bound to @kbd{M-=}) to
-display the number of lines in the region (@pxref{Mark}).  @xref{Pages},
-for the command @kbd{C-x l} which counts the lines in the current page.
+@findex count-words-region
+@findex count-words
+  @kbd{M-=} (@code{count-words-region}) displays a message reporting
+the number of lines, words, and characters in the region.  @kbd{M-x
+count-words} displays a similar message for the entire buffer, or for
+the region if the region is @dfn{active}.  @xref{Mark}, for an
+explanation of the region.
 
 @kindex C-x =
 @findex what-cursor-position
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index cff725027e9..de6e7539c27 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -23,25 +23,21 @@ input.
 @cindex @acronym{ASCII}
 @cindex C-
 @cindex Control
-@cindex control characters
 
   GNU Emacs is primarily designed for use with the keyboard.  While it
 is possible to use the mouse to issue editing commands through the
 menu bar and tool bar, that is not as efficient as using the keyboard.
 Therefore, this manual mainly documents how to edit with the keyboard.
 
+@cindex control character
   Keyboard input into Emacs is based on a heavily-extended version of
-@acronym{ASCII}.  The simplest characters that you can input into
-Emacs correspond to graphic symbols such as @samp{a}, @samp{B},
-@samp{3}, @samp{=}, the space character (conventionally denoted as
-@key{SPC}), and so on.  Entering these using the keyboard is
-straightforward.  Certain characters found on non-English keyboards
-also fall into this category (@pxref{International}).
-
-  In addition to these simple characters, Emacs recognizes
-@dfn{control characters} such as @key{RET}, @key{TAB}, @key{DEL},
-@key{ESC}, @key{F1}, @key{Home}, @key{left}, etc.  Most keyboards have
-special keys for entering these.
+@acronym{ASCII}.  Simple characters, like @samp{a}, @samp{B},
+@samp{3}, @samp{=}, and the space character (denoted as @key{SPC}),
+are entered by typing the corresponding key.  @dfn{Control
+characters}, such as @key{RET}, @key{TAB}, @key{DEL}, @key{ESC},
+@key{F1}, @key{Home}, and @key{left}, are also entered this way, as
+are certain characters found on non-English keyboards
+(@pxref{International}).
 
 @cindex modifier keys
 @cindex Control
@@ -50,13 +46,14 @@ special keys for entering these.
 @cindex M-
   Emacs also recognizes control characters that are entered using
 @dfn{modifier keys}.  Two commonly-used modifier keys are
-@key{Control} (which is usually labelled as @key{Ctrl}), and
-@key{Meta} (which is usually labeled as @key{Alt})@footnote{We refer
-to @key{Alt} as @key{Meta} for historical reasons.}.  For example,
-@kbd{Control-a} is entered by holding down the @key{Ctrl} key while
-pressing @kbd{a}; we will refer to this as @kbd{C-a} for short.
-Similarly @kbd{Meta-a}, or @kbd{M-a} for short, is entered by holding
-down the @key{Alt} key and pressing @kbd{a}.
+@key{Control} (usually labelled @key{Ctrl}), and @key{Meta} (usually
+labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{Meta} for
+historical reasons.}.  For example, @kbd{Control-a} is entered by
+holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
+to this as @kbd{C-a} for short.  Similarly @kbd{Meta-a}, or @kbd{M-a}
+for short, is entered by holding down the @key{Alt} key and pressing
+@kbd{a}.  Modifier keys can also be applied to non-alphanumerical
+characters, e.g. @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
 
 @cindex @key{ESC} replacing @key{Meta} key
   You can also type Meta characters using two-character sequences
@@ -68,33 +65,28 @@ character; instead, press @key{ESC} and release it, then enter the
 next character.  This feature is useful on certain text-only terminals
 where the @key{Meta} key does not function reliably.
 
-  Modifier keys can apply not only to alphanumerical characters, but
-also to special input characters, such as the arrow keys and mouse
-buttons.
-
-@cindex input event
-  @xref{Input Events,,, elisp, The Emacs Lisp Reference Manual}, for
-the full Lisp-level details about keyboard and mouse input, which are
-collectively referred to as @dfn{input events}.  If you are not doing
-Lisp programming, but simply want to redefine the meaning of some
-characters or non-character events, see @ref{Customization}.
-
 @cindex keys stolen by window manager
 @cindex window manager, keys stolen by
-  On graphical displays, the window manager is likely to block the
-character @kbd{M-@key{TAB}} before Emacs can see it.  It may also
-block @kbd{M-@key{SPC}}, @kbd{C-M-d} and @kbd{C-M-l}.  If you have
-these problems, we recommend that you customize your window manager to
-turn off those commands, or put them on key combinations that Emacs
-does not use.
+  On graphical displays, the window manager might block some keyboard
+inputs, including @kbd{M-@key{TAB}}, @kbd{M-@key{SPC}}, @kbd{C-M-d}
+and @kbd{C-M-l}.  If you have this problem, you can either customize
+your window manager to not block those keys, or ``rebind'' the
+affected Emacs commands (@pxref{Customization}).
+
+@cindex input event
+  Simple characters and control characters, as well as certain
+non-keyboard inputs such as mouse clicks, are collectively referred to
+as @dfn{input events}.  For details about how Emacs internally handles
+input events, see @ref{Input Events,,, elisp, The Emacs Lisp Reference
+Manual}.
 
 @node Keys, Commands, User Input, Top
 @section Keys
 
   Some Emacs commands are invoked by just one input event; for
-example, @kbd{C-f} moves forward one character in the buffer.  But
-Emacs also has commands that take two or more input events to invoke,
-such as @kbd{C-x C-f} and @kbd{C-x 4 C-f}.
+example, @kbd{C-f} moves forward one character in the buffer.  Other
+commands take two or more input events to invoke, such as @kbd{C-x
+C-f} and @kbd{C-x 4 C-f}.
 
 @cindex key
 @cindex key sequence
@@ -106,23 +98,23 @@ invokes a command, we call it a @dfn{complete key}; for example,
 @kbd{C-f}, @kbd{C-x C-f} and @kbd{C-x 4 C-f} are all complete keys.
 If a key sequence isn't long enough to invoke a command, we call it a
 @dfn{prefix key}; from the preceding example, we see that @kbd{C-x}
-and @kbd{C-x 4} are prefix keys.  Every key is either a complete key
-or a prefix key.
+and @kbd{C-x 4} are prefix keys.  Every key sequence is either a
+complete key or a prefix key.
 
   A prefix key combines with the following input event to make a
-longer key sequence, which may itself be complete or a prefix.  For
-example, @kbd{C-x} is a prefix key, so @kbd{C-x} and the next input
-event combine to make a two-event key sequence.  This two-event key
-sequence could itself be a prefix key (such as @kbd{C-x 4}), or a
-complete key (such as @kbd{C-x C-f}).  There is no limit to the length
-of a key sequence, but in practice people rarely use sequences longer
-than three or four input events.
-
-  You can't add input events onto a complete key.  For example, the
-two-event sequence @kbd{C-f C-k} is not a key, because the @kbd{C-f}
-is a complete key in itself, so @kbd{C-f C-k} cannot have an
-independent meaning as a command.  @kbd{C-f C-k} is two key sequences,
-not one.@refill
+longer key sequence.  For example, @kbd{C-x} is a prefix key, so
+typing @kbd{C-x} alone does not invoke a command; instead, Emacs waits
+for further input (if you pause for longer than a second, it echoes
+the @kbd{C-x} key to prompt for that input; @pxref{Echo Area}).
+@kbd{C-x} combines with the next input event to make a two-event key
+sequence, which could itself be a prefix key (such as @kbd{C-x 4}), or
+a complete key (such as @kbd{C-x C-f}).  There is no limit to the
+length of key sequences, but in practice they are seldom longer than
+three or four input events.
+
+  You can't add input events onto a complete key.  For example,
+because @kbd{C-f} is a complete key, the two-event sequence @kbd{C-f
+C-k} is two key sequences, not one.
 
   By default, the prefix keys in Emacs are @kbd{C-c}, @kbd{C-h},
 @kbd{C-x}, @kbd{C-x @key{RET}}, @kbd{C-x @@}, @kbd{C-x a}, @kbd{C-x
@@ -132,22 +124,20 @@ aliases for @kbd{C-h} and @kbd{C-x 6}.)  This list is not cast in
 stone; if you customize Emacs, you can make new prefix keys.  You
 could even eliminate some of the standard ones, though this is not
 recommended for most users; for example, if you remove the prefix
-definition of @kbd{C-x 4}, then @kbd{C-x 4 @var{anything}} would
-become an invalid key sequence.  @xref{Key Bindings}.
+definition of @kbd{C-x 4}, then @kbd{C-x 4 C-f} becomes an invalid key
+sequence.  @xref{Key Bindings}.
 
   Typing the help character (@kbd{C-h} or @key{F1}) after a prefix key
 displays a list of the commands starting with that prefix.  The sole
 exception to this rule is @key{ESC}: @kbd{@key{ESC} C-h} is equivalent
 to @kbd{C-M-h}, which does something else entirely.  You can, however,
-use @key{F1} to displays a list of the commands starting with
-@key{ESC}.
+use @key{F1} to display a list of commands starting with @key{ESC}.
 
 @node Commands, Entering Emacs, Keys, Top
 @section Keys and Commands
 
 @cindex binding
 @cindex command
-@cindex function definition
   This manual is full of passages that tell you what particular keys
 do.  But Emacs does not assign meanings to keys directly.  Instead,
 Emacs assigns meanings to named @dfn{commands}, and then gives keys
@@ -155,11 +145,9 @@ their meanings by @dfn{binding} them to commands.
 
   Every command has a name chosen by a programmer.  The name is
 usually made of a few English words separated by dashes; for example,
-@code{next-line} or @code{forward-word}.  A command also has a
-@dfn{function definition} which is a Lisp program; this is how the
-command does its work.  In Emacs Lisp, a command is a Lisp function
-with special properties that make it suitable for interactive use.
-For more information on commands and functions, see @ref{What Is a
+@code{next-line} or @code{forward-word}.  Internally, each command is
+a special type of Lisp @dfn{function}, and the actions associated with
+the command are performed by running the function.  @xref{What Is a
 Function,, What Is a Function, elisp, The Emacs Lisp Reference
 Manual}.
 
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index bb675b61cff..286595c2b45 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -264,7 +264,7 @@ Basic Editing Commands
 * Basic Help::          Asking what a character does.
 * Blank Lines::         Making and deleting blank lines.
 * Continuation Lines::  How Emacs displays lines too wide for the screen.
-* Position Info::       What page, line, row, or column is point on?
+* Position Info::       What line, row, or column is point on?
 * Arguments::           Numeric arguments for repeating a command N times.
 * Repeating::           Repeating the previous command quickly.
 
@@ -282,6 +282,7 @@ Completion
 * Completion Example::  Examples of using completion.
 * Completion Commands:: A list of completion commands.
 * Strict Completion::   Different types of completion.
+* Completion Styles::   How completion matches are chosen.
 * Completion Options::  Options for completion.
 
 Help
@@ -291,10 +292,10 @@ Help
 * Name Help::           Asking about a command, variable or function name.
 * Apropos::             Asking what pertains to a given topic.
 * Help Mode::           Special features of Help mode and Help buffers.
-* Library Keywords::    Finding Lisp libraries by keywords (topics).
+* Package Keywords::    Finding Lisp libraries by keywords (topics).
 * Language Help::       Help relating to international language support.
 * Misc Help::           Other help commands.
-* Help Files::          Commands to display pre-written help files.
+* Help Files::          Commands to display auxilliary help files.
 * Help Echo::           Help on active text and tooltips (`balloon help').
 
 The Mark and the Region
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index 3c4a74c02b5..4a76f206aed 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -19,49 +19,45 @@
 
   The usual way to invoke Emacs is with the shell command
 @command{emacs}.  From a terminal window running in the X Window
-System, you can also run Emacs in the background with
-@command{emacs&}; this way, Emacs won't tie up the terminal window, so
-you can use it to run other shell commands.
+System, you can run Emacs in the background with @command{emacs &};
+this way, Emacs won't tie up the terminal window, so you can use it to
+run other shell commands.
 
 @cindex startup screen
   When Emacs starts up, the initial frame displays a special buffer
-named @samp{*GNU Emacs*}.  This buffer contains some information about
-Emacs, and includes @dfn{links} to common tasks that might be useful
-to beginning users.  For instance, activating the @samp{Emacs
+named @samp{*GNU Emacs*}.  This @dfn{startup screen} contains
+information about Emacs and @dfn{links} to common tasks that are
+useful for beginning users.  For instance, activating the @samp{Emacs
 Tutorial} link opens the Emacs tutorial; this does the same thing as
 the command @kbd{C-h t} (@code{help-with-tutorial}).  To activate a
 link, either move point onto it and type @kbd{@key{RET}}, or click on
 it with @kbd{mouse-1} (the left mouse button).
 
   Using a command line argument, you can tell Emacs to visit one or
-more specific files as soon as it starts up.  For example,
-@command{emacs foo.txt} starts Emacs with a buffer displaying the
-contents of the file @samp{foo.txt}.  This feature exists mainly for
-compatibility with other editors, which are designed to edit one file
-at a time: once you are done with that file, you exit the editor, and
-start it again the next time you need it.
-
-  Using Emacs in this way---starting it afresh each time you want to
-edit a file---is unnecessary and wasteful.  Emacs can visit more than
-one file in a single editing session, and exiting the Emacs session
-loses valuable accumulated context, such as the kill ring, registers,
-undo history, and mark ring.  These features, described later in the
-manual, are useful for performing edits across multiple files, or
-continuing edits to a single file.
-
-  The recommended way to use Emacs is to start it only once, just
-after you log in, and do all your editing in the same Emacs session.
-Each time you edit a file, visit it with the existing Emacs, which
-eventually has many files in it ready for editing.  @xref{Files}, for
-more information on visiting more than one file.
+more files as soon as it starts up.  For example, @command{emacs
+foo.txt} starts Emacs with a buffer displaying the contents of the
+file @samp{foo.txt}.  This feature exists mainly for compatibility
+with other editors, which are designed to be launched from the shell
+for short editing sessions.  If you call Emacs this way, the initial
+frame is split into two windows---one showing the specified file, and
+the other showing the startup screen.  @xref{Windows}.
+
+  Generally, it is unnecessary and wasteful to start Emacs afresh each
+time you want to edit a file.  The recommended way to use Emacs is to
+start it just once, just after you log in, and do all your editing in
+the same Emacs session.  @xref{Files}, for information on visiting
+more than one file.  If you use Emacs this way, the Emacs session
+accumulates valuable context, such as the kill ring, registers, undo
+history, and mark ring data, which together make editing more
+convenient.  These features are described later in the manual.
 
   To edit a file from another program while Emacs is running, you can
 use the @command{emacsclient} helper program to open a file in the
-already running Emacs.  @xref{Emacs Server}.
+existing Emacs session.  @xref{Emacs Server}.
 
   Emacs accepts other command line arguments that tell it to load
-certain Lisp files, call certain functions, and so forth.  These
-features exist mainly for advanced users.  @xref{Emacs Invocation}.
+certain Lisp files, where to put the initial frame, and so forth.
+@xref{Emacs Invocation}.
 
 @vindex inhibit-startup-screen
   If the variable @code{inhibit-startup-screen} is non-@code{nil},
@@ -72,11 +68,10 @@ which can be used to evaluate Emacs Lisp expressions interactively.
 @xref{Lisp Interaction}.  You can set the variable
 @code{inhibit-startup-screen} using the Customize facility
 (@pxref{Easy Customization}), or by editing your initialization file
-(@pxref{Init File}).@footnote{Note that setting
-@code{inhibit-startup-screen} in @file{site-start.el} doesn't work,
-because the startup screen is set up before reading
-@file{site-start.el}.  @xref{Init File}, for information about
-@file{site-start.el}.}
+(@pxref{Init File}).@footnote{Setting @code{inhibit-startup-screen} in
+@file{site-start.el} doesn't work, because the startup screen is set
+up before reading @file{site-start.el}.  @xref{Init File}, for
+information about @file{site-start.el}.}
 
   You can also force Emacs to display a file or directory at startup
 by setting the variable @code{initial-buffer-choice} to a
@@ -105,13 +100,13 @@ On a text terminal, suspend Emacs; on a graphical display,
 @findex save-buffers-kill-terminal
   @dfn{Killing} Emacs means terminating the Emacs program.  To do
 this, type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}).  A
-two-character key is used to make it harder to type by accident.  If
-there are any modified file-visiting buffers when you type @kbd{C-x
-C-c}, Emacs first offers to save these buffers.  If you do not save
-them all, it asks for confirmation again, since the unsaved changes
-will be lost.  Emacs also asks for confirmation if any subprocesses
-are still running, since killing Emacs will also kill the subprocesses
-(@pxref{Shell}).
+two-character key sequence is used to make it harder to type by
+accident.  If there are any modified file-visiting buffers when you
+type @kbd{C-x C-c}, Emacs first offers to save these buffers.  If you
+do not save them all, it asks for confirmation again, since the
+unsaved changes will be lost.  Emacs also asks for confirmation if any
+subprocesses are still running, since killing Emacs will also kill the
+subprocesses (@pxref{Shell}).
 
   @kbd{C-x C-c} behaves specially if you are using Emacs as a server.
 If you type it from a ``client frame'', it closes the client
@@ -135,39 +130,19 @@ default value of @code{confirm-kill-emacs} is @code{nil}.
   To kill Emacs without being prompted about saving, type @kbd{M-x
 kill-emacs}.
 
-@cindex minimizing a frame
-@cindex iconifying
-@cindex suspending
-  You can ``exit'' Emacs in two other ways.  On a graphical display,
-you can @dfn{minimize} (or @dfn{iconify}) an Emacs frame; depending on
-the window system, this either replaces the Emacs frame with a tiny
-``icon'' or conceals the frame entirely (@pxref{Frames}).  On a
-text-only terminal, you can @dfn{suspend} Emacs; this means stopping
-the Emacs program temporarily, returning control to its parent process
-(usually a shell).
-
 @kindex C-z
 @findex suspend-frame
+@cindex minimizing
+@cindex iconifying
+@cindex suspending
   @kbd{C-z} runs the command @code{suspend-frame}.  On a graphical
-display, this ``minimizes'' (or ``iconifies'') the selected Emacs
-frame.  On a text terminal, this suspends the Emacs process.
-
-  After minimizing or suspending Emacs, you can return to it and
-continue editing wherever you left off.  The way to do this depends on
-the window system or shell.  In most common shells, you can resume
-Emacs after suspending it with the shell command @command{%emacs}.
-
-@vindex cannot-suspend
-  On very old systems that don't support suspending programs,
-@kbd{C-z} starts an inferior shell that communicates directly with the
-terminal, and Emacs waits until you exit the subshell.  (The way to
-exit the subshell is usually @kbd{C-d} or @command{exit}.)  On these
-systems, you can only get back to the shell from which Emacs was run
-(to log out, for example) when you kill Emacs.  Suspending can also
-fail if you run Emacs under a shell that doesn't support suspending
-jobs, even if the system itself does support it.  In this case, you
-can set the variable @code{cannot-suspend} to a non-@code{nil} value
-to force @kbd{C-z} to start an inferior shell.
+display, this command @dfn{minimizes} (or @dfn{iconifies}) the
+selected Emacs frame, hiding it in a way that lets you bring it back
+later (exactly how this hiding occurs depends on the window system).
+On a text terminal, the @kbd{C-z} command @dfn{suspends} Emacs,
+stopping the program temporarily and returning control to the parent
+process (usually a shell); in most shells, you can resume Emacs after
+suspending it with the shell command @command{%emacs}.
 
   Text-only terminals usually listen for certain special characters
 whose meaning is to kill or suspend the program you are running.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 2672c30363b..433bf617598 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -54,11 +54,13 @@ Note that file name completion ignores file names whose extensions
 appear in the variable @code{completion-ignored-extensions}
 (@pxref{Completion Options}).
 
+@cindex default file name
   For most operations, there is a @dfn{default file name} which is
 used if you type just @key{RET} to enter an empty argument.  Normally,
 the default file name is the name of the file visited in the current
 buffer.
 
+@cindex default directory
 @vindex default-directory
 @vindex insert-default-directory
   Each buffer has a @dfn{default directory} which is normally the same
@@ -1863,7 +1865,7 @@ then specifying @file{/tmp/foo*bar} will visit only
 @cindex file name caching
 @cindex cache of file names
 @pindex find
-@kindex C-@key{TAB}
+@kindex C-TAB
 @findex file-cache-minibuffer-complete
   You can use the @dfn{file name cache} to make it easy to locate a
 file by name, without having to remember exactly where it is located.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 619252503a9..fc78f90db15 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1229,8 +1229,7 @@ raises the frame.
 
 @node Non-Window Terminals
 @section Non-Window Terminals
-@cindex non-window terminals
-@cindex single-frame terminals
+@cindex text-only terminal
 
   On a text-only terminal, Emacs can display only one Emacs frame at a
 time.  However, you can still create multiple Emacs frames, and switch
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 9ff995138f5..a85edf101e5 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -11,31 +11,19 @@
 @kindex C-h
 @kindex F1
 
-  Emacs provides extensive help features, all accessible through the
-@dfn{help character}, @kbd{C-h}.  This is a prefix key that is used
-for commands that display documentation; the next character you type
-should be a @dfn{help option}, to ask for a particular kind of help.
-You can cancel the @kbd{C-h} command with @kbd{C-g}.  The function key
-@key{F1} is equivalent to @kbd{C-h}.
-
 @kindex C-h C-h
 @findex help-for-help
-  @kbd{C-h} itself is one of the help options; @kbd{C-h C-h} displays
-a list of help options, with a brief description of each one
-(@code{help-for-help}).  You can scroll the list with @key{SPC} and
-@key{DEL}, then type the help option you want.  To cancel, type
-@kbd{C-g}.
-
-  @kbd{C-h} or @key{F1} means ``help'' in various other contexts as
-well.  For instance, you can type them after a prefix key to display
-a list of the keys that can follow the prefix key.  (A few prefix keys
-don't support @kbd{C-h} in this way, because they define other
-meanings for it, but they all support @key{F1} for help.)
-
-  Most help buffers use a special major mode, Help mode, which lets
-you scroll conveniently with @key{SPC} and @key{DEL}.  You can also
-follow hyperlinks to URLs, and to other facilities including Info
-nodes and customization buffers.  @xref{Help Mode}.
+  Emacs provides a wide variety of help commands, all accessible
+through the prefix key @kbd{C-h} (or, equivalently, the function key
+@key{F1}).  These help commands are described in the following
+sections.  You can also type @kbd{C-h C-h} to view a list of help
+commands (@code{help-for-help}).  You can scroll the list with
+@key{SPC} and @key{DEL}, then type the help command you want.  To
+cancel, type @kbd{C-g}.
+
+  Many help commands display their information in a special @dfn{help
+buffer}.  In this buffer, you can type @key{SPC} and @key{DEL} to
+scroll and type @key{RET} to follow hyperlinks.  @xref{Help Mode}.
 
 @cindex searching documentation efficiently
 @cindex looking for a subject in documentation
@@ -51,33 +39,38 @@ This searches for commands whose names match the argument
 regular expression (@pxref{Regexps}).  @xref{Apropos}.
 
 @item C-h i d m emacs @key{RET} i @var{topic} @key{RET}
-This searches for @var{topic} in the indices of the on-line Emacs
-manual, and displays the first match found.  Press @kbd{,} to see
-subsequent matches.  You can use a regular expression as @var{topic}.
+This searches for @var{topic} in the indices of the Emacs Info manual,
+displaying the first match found.  Press @kbd{,} to see subsequent
+matches.  You can use a regular expression as @var{topic}.
 
 @item C-h i d m emacs @key{RET} s @var{topic} @key{RET}
 Similar, but searches the @emph{text} of the manual rather than the
 indices.
 
 @item C-h C-f
-This displays the Emacs FAQ.  You can use the Info commands
-to browse it.
+This displays the Emacs FAQ, using Info.
 
 @item C-h p
 This displays the available Emacs packages based on keywords.
-@xref{Library Keywords}.
+@xref{Package Keywords}.
 @end table
 
+  @kbd{C-h} or @key{F1} means ``help'' in various other contexts as
+well.  For instance, you can type them after a prefix key to view a
+list of the keys that can follow the prefix key.  (A few prefix keys
+don't support @kbd{C-h} in this way, because they define other
+meanings for it, but they all support @key{F1} for help.)
+
 @menu
 * Help Summary::        Brief list of all Help commands.
 * Key Help::            Asking what a key does in Emacs.
 * Name Help::           Asking about a command, variable or function name.
 * Apropos::             Asking what pertains to a given topic.
 * Help Mode::           Special features of Help mode and Help buffers.
-* Library Keywords::    Finding Lisp libraries by keywords (topics).
+* Package Keywords::    Finding Lisp libraries by keywords (topics).
 * Language Help::       Help relating to international language support.
 * Misc Help::           Other help commands.
-* Help Files::          Commands to display pre-written help files.
+* Help Files::          Commands to display auxilliary help files.
 * Help Echo::           Help on active text and tooltips (`balloon help').
 @end menu
 
@@ -89,21 +82,20 @@ This displays the available Emacs packages based on keywords.
 @section Help Summary
 @end ifnottex
 
-  Here is a summary of the Emacs interactive help commands.  (The
-character that follows @kbd{C-h} is the ``help option.'')  See
-@ref{Help Files}, for other help commands that display fixed files
-of information.
+  Here is a summary of help commands for accessing the built-in
+documentation.  Most of these are described in more detail in the
+following sections.
 
 @table @kbd
 @item C-h a @var{topics} @key{RET}
 Display a list of commands whose names match @var{topics}
-(@code{apropos-command}; @pxref{Apropos}).
+(@code{apropos-command}).
 @item C-h b
 Display all active key bindings; minor mode bindings first, then those
 of the major mode, then global bindings (@code{describe-bindings}).
 @item C-h c @var{key}
-Given a key sequence @var{key}, show the name of the command that it
-runs (@code{describe-key-briefly}).  Here @kbd{c} stands for
+Show the name of the command that the key sequence @var{key} is bound
+to (@code{describe-key-briefly}).  Here @kbd{c} stands for
 ``character.''  For more extensive information on @var{key}, use
 @kbd{C-h k}.
 @item C-h d @var{topics} @key{RET}
@@ -120,8 +112,8 @@ this works for commands too.
 Display the @file{HELLO} file, which shows examples of various character
 sets.
 @item C-h i
-Run Info, the GNU documentation browser (@code{info}).
-The complete Emacs manual is available on-line in Info.
+Run Info, the GNU documentation browser (@code{info}).  The Emacs
+manual is available in Info.
 @item C-h k @var{key}
 Display the name and documentation of the command that @var{key} runs
 (@code{describe-key}).
@@ -134,20 +126,18 @@ Display documentation of the current major mode (@code{describe-mode}).
 Display news of recent Emacs changes (@code{view-emacs-news}).
 @item C-h p
 Find packages by topic keyword (@code{finder-by-keyword}).  This lists
-packages using a package menu buffer (@pxref{Package Menu}); for an
-alternative interface to the same information, try the
-@code{info-finder} command.
+packages using a package menu buffer.  @xref{Packages}.
 @item C-h P @var{package} @key{RET}
 Display documentation about the package named @var{package}
-(@code{describe-package}; @pxref{Packages}).
+(@code{describe-package}).
 @item C-h r
 Display the Emacs manual in Info (@code{info-emacs-manual}).
 @item C-h s
-Display the current contents of the @dfn{syntax table}, with an
-explanation of what they mean (@code{describe-syntax}).  The syntax
-table says which characters are opening delimiters, which are parts of
-words, which are string quotes, and so on.  @xref{Syntax Tables,,
-Syntax Tables, elisp, The Emacs Lisp Reference Manual}, for details.
+Display the contents of the current @dfn{syntax table}
+(@code{describe-syntax}).  The syntax table says which characters are
+opening delimiters, which are parts of words, and so on.  @xref{Syntax
+Tables,, Syntax Tables, elisp, The Emacs Lisp Reference Manual}, for
+details.
 @item C-h t
 Enter the Emacs interactive tutorial (@code{help-with-tutorial}).
 @item C-h v @var{var} @key{RET}
@@ -184,27 +174,27 @@ Display the help message for a special text area, if point is in one
 @node Key Help
 @section Documentation for a Key
 
-@kindex C-h c
 @findex describe-key-briefly
+@findex describe-key
   The help commands to get information about a key sequence are
-@kbd{C-h c} and @w{@kbd{C-h k}}.  @kbd{C-h c @var{key}} displays in
-the echo area the name of the command that @var{key} is bound to.  For
-example, @kbd{C-h c C-f} displays @samp{forward-char}.  Since command
-names are chosen to describe what the commands do, this gives you a
-very brief description of what @var{key} does.
+@kbd{C-h c} (@code{describe-key-briefly}) and @kbd{C-h k}
+(@code{describe-key}).
+
+@kindex C-h c
+  @kbd{C-h c @var{key}} displays in the echo area the name of the
+command that @var{key} is bound to.  For example, @kbd{C-h c C-f}
+displays @samp{forward-char}.
 
+@cindex documentation string
 @kindex C-h k
-@findex describe-key
   @kbd{C-h k @var{key}} is similar but gives more information: it
-displays the documentation string of the command as well as its name.
-It displays this information in a window, since it may not fit in the
-echo area.
+displays a help buffer containing the command's @dfn{documentation
+string}, which describes exactly what the command does.
 
 @kindex C-h K
 @findex Info-goto-emacs-key-command-node
-  To find the documentation of a key sequence @var{key}, type @kbd{C-h
-K @var{key}}.  This displays the appropriate manual section which
-contains the documentation of @var{key}.
+  @kbd{C-h K @var{key}} displays the section of the Emacs manual that
+describes the command corresponding to @var{key}.
 
   @kbd{C-h c}, @kbd{C-h k} and @kbd{C-h K} work for any sort of key
 sequences, including function keys, menus, and mouse events.  For
@@ -271,14 +261,8 @@ the Lisp symbol around or before point, if that is the name of a
 defined Lisp variable.  @xref{Variables}.
 
   Help buffers that describe Emacs variables and functions normally
-have hyperlinks to the corresponding source definition, if you have
-the source files installed.  (@xref{Hyperlinking}.)  If you know Lisp
-(or C), this provides the ultimate documentation.  If you don't know
-Lisp, you should learn it.  (The Introduction to Emacs Lisp
-Programming, available from the FSF through fsf.org, is a good way to
-get started.)  If Emacs feels you are just @emph{using} it, treating
-it as an object program, its feelings may be hurt.  For real intimacy,
-read the Emacs source code.
+have hyperlinks to the corresponding source code, if you have the
+source files installed (@pxref{Hyperlinking}).
 
 @kindex C-h F
 @findex Info-goto-emacs-command-node
@@ -288,53 +272,58 @@ manuals, not just the Emacs manual, and finds the right one.
 
 @node Apropos
 @section Apropos
+@cindex apropos
 
   The @dfn{apropos} commands answer questions like, ``What are the
 commands for working with files?''  More precisely, you specify an
 @dfn{apropos pattern}, which means either a word, a list of words, or
-a regular expression.  Each apropos command displays a list of items
-that match the pattern, in a separate buffer.
+a regular expression.
+
+  Each of the following apropos commands reads an apropos pattern in
+the minibuffer, searches for items that match the pattern, and
+displays the results in a different window.
 
 @table @kbd
-@item C-h a @var{pattern} @key{RET}
-Search for commands whose names match @var{pattern}.
+@item C-h a
+@kindex C-h a
+@findex apropos-command
+Search for commands (@code{apropos-command}).  With a prefix argument,
+search for noninteractive functions too.
 
-@item M-x apropos @key{RET} @var{pattern} @key{RET}
-Search for functions and variables whose names match @var{pattern}.
-Both interactive functions (commands) and noninteractive functions can
-be found by this command.
+@item M-x apropos
+@findex apropos
+Search for functions and variables.  Both interactive functions
+(commands) and noninteractive functions can be found by this.
 
-@item M-x apropos-variable @key{RET} @var{pattern} @key{RET}
-Search for user-option variables whose names match @var{pattern}.
+@item M-x apropos-variable
+@findex apropos-variable
+Search for user-customizable variables.  With a prefix argument,
+search for non-customizable variables too.
 
-@item M-x apropos-value @key{RET} @var{pattern} @key{RET}
-Search for functions whose definitions match @var{pattern}, and
-variables whose values match @var{pattern}.
+@item M-x apropos-value
+@findex apropos-value
+Search for variables whose values match the specified pattern.  With a
+prefix argument, search also for functions with definitions matching
+the pattern, and Lisp symbols with properties matching the pattern.
 
-@item C-h d @var{pattern} @key{RET}
-Search for functions and variables whose @strong{documentation
-strings} match @var{pattern}.
+@item C-h d
+@kindex C-h d
+@findex apropos-documentation
+Search for functions and variables whose documentation strings match
+the specified pattern (@code{apropos-documentation}).
 @end table
 
-@kindex C-h a
-@findex apropos-command
-@cindex apropos
-  The simplest kind of apropos pattern is one word.  Anything which
-contains that word matches the pattern.  Thus, to find the commands
-that work on files, type @kbd{C-h a file @key{RET}}.  This displays a
-list of all command names that contain @samp{file}, including
+  The simplest kind of apropos pattern is one word.  Anything
+containing that word matches the pattern.  Thus, to find commands that
+work on files, type @kbd{C-h a file @key{RET}}.  This displays a list
+of all command names that contain @samp{file}, including
 @code{copy-file}, @code{find-file}, and so on.  Each command name
 comes with a brief description and a list of keys you can currently
 invoke it with.  In our example, it would say that you can invoke
 @code{find-file} by typing @kbd{C-x C-f}.
 
-  The @kbd{a} in @kbd{C-h a} stands for ``Apropos''; @kbd{C-h a}
-runs the command @code{apropos-command}.  This command normally checks
-only commands (interactive functions); if you specify a prefix
-argument, it checks noninteractive functions as well.
-
   For more information about a function definition, variable or symbol
-property listed in the apropos buffer, you can click on it with
+property listed in an apropos buffer, you can click on it with
 @kbd{Mouse-1} or @kbd{Mouse-2}, or move there and type @key{RET}.
 
   When you specify more than one word in the apropos pattern, a name
@@ -362,160 +351,117 @@ mark, insert, yank, fill, indent, case, change, set, what, list, find,
 view, describe, default.
 @end quotation
 
-@findex apropos
-  Use @kbd{M-x apropos} instead of @kbd{C-h a} to list all the Lisp
-symbols that match an apropos pattern, not just the symbols that are
-commands.  This command does not list key bindings by default; specify
-a numeric argument if you want it to list them.
-
-@findex apropos-variable
-  Use @kbd{M-x apropos-variable} to list user-customizable variables
-that match an apropos pattern.  If you specify a prefix argument, it
-lists all matching variables.
-
-@kindex C-h d
-@findex apropos-documentation
-  The @code{apropos-documentation} command is like @code{apropos}
-except that it searches documentation strings instead of symbol names
-for matches.
-
-@findex apropos-value
-  The @code{apropos-value} command is like @code{apropos} except that
-it searches variables' values for matches for the apropos pattern.
-With a prefix argument, it also checks symbols' function definitions
-and property lists.
-
 @vindex apropos-do-all
   If the variable @code{apropos-do-all} is non-@code{nil}, the apropos
 commands always behave as if they had been given a prefix argument.
 
 @vindex apropos-sort-by-scores
 @cindex apropos search results, order by score
-  By default, apropos lists the search results in alphabetical order.
-If the variable @code{apropos-sort-by-scores} is non-@code{nil}, the
-apropos commands try to guess the relevance of each result, and
-display the most relevant ones first.
-
 @vindex apropos-documentation-sort-by-scores
-  By default, apropos lists the search results for
-@code{apropos-documentation} in order of relevance of the match.  If
-the variable @code{apropos-documentation-sort-by-scores} is
-@code{nil}, apropos lists the symbols found in alphabetical order.
+  By default, all apropos commands except @code{apropos-documentation}
+list their results in alphabetical order.  If the variable
+@code{apropos-sort-by-scores} is non-@code{nil}, these commands
+instead try to guess the relevance of each result, and display the
+most relevant ones first.  The @code{apropos-documentation} command
+lists its results in order of relevance by default; to list them in
+alphabetical order, change the variable
+@code{apropos-documentation-sort-by-scores} to @code{nil}.
 
 @node Help Mode
 @section Help Mode Commands
 
   Help buffers provide the same commands as View mode (@pxref{View
-Mode}), plus a few special commands of their own.
+Mode}); for instance, @key{SPC} scrolls forward, and @key{DEL} scrolls
+backward.  A few special commands are also provided:
 
 @table @kbd
-@item @key{SPC}
-Scroll forward.
-@item @key{DEL}
-Scroll backward.
 @item @key{RET}
-Follow a cross reference at point.
+Follow a cross reference at point (@code{help-follow}).
 @item @key{TAB}
-Move point forward to the next cross reference.
+Move point forward to the next hyperlink (@code{forward-button}).
 @item S-@key{TAB}
-Move point back to the previous cross reference.
+Move point back to the previous hyperlink (@code{backward-button}).
 @item Mouse-1
 @itemx Mouse-2
-Follow a cross reference that you click on.
+Follow a hyperlink that you click on.
 @item C-c C-c
-Show all documentation about the symbol at point.
+Show all documentation about the symbol at point
+(@code{help-follow-symbol}).
+@item C-c C-b
+Go back to the previous help topic (@code{help-go-back}).
 @end table
 
-  When a function name (@pxref{M-x,, Running Commands by Name}),
-variable name (@pxref{Variables}), or face name (@pxref{Faces})
-appears in the documentation, it normally appears inside paired
-single-quotes.  To view the documentation of that command, variable or
-face, you can click on the name with @kbd{Mouse-1} or @kbd{Mouse-2},
-or move point there and type @key{RET}.  Use @kbd{C-c C-b} to retrace
-your steps.
+@cindex hyperlink
+@findex help-follow
+@findex help-go-back
+@kindex RET @r{(Help mode)}
+@kindex C-c C-b @r{(Help mode)}
+  When a function name, variable name, or face name (@pxref{Faces})
+appears in the documentation in the help buffer, it is normally an
+underlined @dfn{hyperlink}.  To view the associated documentation,
+move point there and type @key{RET} (@code{help-follow}), or click on
+the hyperlink with @kbd{Mouse-1} or @kbd{Mouse-2}.  Doing so replaces
+the contents of the help buffer; to retrace your steps, type @kbd{C-c
+C-b} (@code{help-go-back}).
 
 @cindex URL, viewing in help
 @cindex help, viewing web pages
 @cindex viewing web pages in help
 @cindex web pages, viewing in help
 @findex browse-url
-  You can follow cross references to URLs (web pages) also.  This uses
-the @code{browse-url} command to view the page in the browser you
-choose.  @xref{Browse-URL}.
-
-@kindex @key{TAB} @r{(Help mode)}
-@findex help-next-ref
-@kindex S-@key{TAB} @r{(Help mode)}
-@findex help-previous-ref
-  There are convenient commands to move point to cross references in
-the help text.  @key{TAB} (@code{help-next-ref}) moves point down to
-the next cross reference.  @kbd{S-@key{TAB}} moves up to the previous
-cross reference (@code{help-previous-ref}).
-
-  To view all documentation about any symbol name that appears in the
-text, move point to the symbol name and type @kbd{C-c C-c}
-(@code{help-follow-symbol}).  This shows all available documentation
-about the symbol as a variable, function and/or face.  As above, use
-@kbd{C-c C-b} to retrace your steps.
-
-@node Library Keywords
-@section Keyword Search for Lisp Libraries
+  A help buffer can also contain hyperlinks to Info manuals, source
+code definitions, and URLs (web pages).  The first two are opened in
+Emacs, and the third using a web browser via the @code{browse-url}
+command (@pxref{Browse-URL}).
+
+@kindex TAB @r{(Help mode)}
+@findex forward-button
+@kindex S-TAB @r{(Help mode)}
+@findex backward-button
+  In a help buffer, @key{TAB} (@code{forward-button}) moves point
+forward to the next hyperlink, while @kbd{S-@key{TAB}}
+(@code{backward-button}) point back to the previous hyperlink.  These
+commands act cyclically; for instance, typing @key{TAB} at the last
+hyperlink moves back to the first hyperlink.
+
+  To view all documentation about any symbol in the text, move point
+to there and type @kbd{C-c C-c} (@code{help-follow-symbol}).  This
+shows all available documentation about the symbol---as a variable,
+function and/or face.
+
+@node Package Keywords
+@section Keyword Search for Packages
+@cindex finder
+
+Most optional features in Emacs are grouped into @dfn{packages}.
+Emacs contains several hundred built-in packages, and more can be
+installed over the network (@pxref{Packages}).
 
 @kindex C-h p
 @findex finder-by-keyword
-The @kbd{C-h p} command lets you search the standard Emacs Lisp
-libraries by topic keywords.  Here is a partial list of keywords you can
-use:
-
-@multitable {convenience} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}
-@item abbrev@tab abbreviation handling, typing shortcuts, macros.
-@item bib@tab code related to the @code{bib} bibliography processor.
-@item c@tab support for the C language and related languages.
-@item calendar@tab calendar and time management support.
-@item comm@tab communications, networking, remote access to files.
-@item convenience@tab convenience features for faster editing.
-@item data@tab support for editing files of data.
-@item docs@tab support for Emacs documentation.
-@item emulations@tab emulations of other editors.
-@item extensions@tab Emacs Lisp language extensions.
-@item faces@tab support for multiple fonts.
-@item files@tab support for editing and manipulating files.
-@item frames@tab support for Emacs frames and window systems.
-@item games@tab games, jokes and amusements.
-@item hardware@tab support for interfacing with exotic hardware.
-@item help@tab support for on-line help systems.
-@item hypermedia@tab support for links between text or other media types.
-@item i18n@tab internationalization and alternate character-set support.
-@item internal@tab code for Emacs internals, build process, defaults.
-@item languages@tab specialized modes for editing programming languages.
-@item lisp@tab Lisp support, including Emacs Lisp.
-@item local@tab code local to your site.
-@item maint@tab maintenance aids for the Emacs development group.
-@item mail@tab modes for electronic-mail handling.
-@item matching@tab various sorts of searching and matching.
-@item mouse@tab mouse support.
-@item multimedia@tab images and sound support.
-@item news@tab support for netnews reading and posting.
-@item oop@tab support for object-oriented programming.
-@item outlines@tab support for hierarchical outlining.
-@item processes@tab process, subshell, compilation, and job control support.
-@item terminals@tab support for terminal types.
-@item tex@tab supporting code for the @TeX{} formatter.
-@item tools@tab programming tools.
-@item unix@tab front-ends/assistants for, or emulators of, UNIX-like features.
-@item wp@tab word processing.
-@end multitable
+  To make it easier to find packages related to a topic, most packages
+are associated with one or more @dfn{keywords} based on what they do.
+Type @kbd{C-h p} (@code{finder-by-keyword}) to bring up a list of
+package keywords, together with a description of what the keywords
+mean.  To view a list of packages for a given keyword, type @key{RET}
+on that line; this displays the list of packages in a Package Menu
+buffer (@pxref{Package Menu}).
+
+@findex describe-package
+@kindex C-h P
+  @kbd{C-h P} (@code{describe-package}) prompts for the name of a
+package, and displays a help buffer describing the attributes of the
+package and the features that it implements.
 
 @node Language Help
 @section Help for International Language Support
 
-  You can use the command @kbd{C-h L}
-(@code{describe-language-environment}) to get information about a
-specific language environment.  @xref{Language Environments}.  This
-tells you which languages this language environment supports.  It also
-lists the character sets, coding systems, and input methods that work
-with this language environment, and finally shows some sample text to
-illustrate scripts.
+  For information on a specific language environment (@pxref{Language
+Environments}), type @kbd{C-h L}
+(@code{describe-language-environment}).  This displays a help buffer
+describing the languages supported by the language environment, and
+listing the associated character sets, coding systems, and input
+methods, as well as some sample text for that language environment.
 
   The command @kbd{C-h h} (@code{view-hello-file}) displays the file
 @file{etc/HELLO}, which shows how to say ``hello'' in many languages.
@@ -604,12 +550,11 @@ these is @key{ESC}, because @kbd{@key{ESC} C-h} is actually
 @node Help Files
 @section Help Files
 
-  The Emacs help commands described above display dynamic help based
-on the current state within Emacs, or refer to manuals.  Other help
-commands display pre-written, static help files.
-
-  Except for @kbd{C-h g}, these commands all have the form @kbd{C-h
-C-@var{char}}; that is, @kbd{C-h} followed by a control character.
+  Apart from the built-in documentation and manuals, Emacs contains
+several other files describing topics like copying conditions, release
+notes, instructions for debugging and reporting bugs, and so forth.
+You can use the following commands to view these files.  Apart from
+@kbd{C-h g}, they all have the form @kbd{C-h C-@var{char}}.
 
 @kindex C-h C-c
 @findex describe-copying
@@ -636,24 +581,23 @@ C-@var{char}}; that is, @kbd{C-h} followed by a control character.
 
 @table @kbd
 @item C-h C-c
-Display the Emacs copying conditions (@code{describe-copying}).
-These are the rules under which you can copy and redistribute Emacs.
+Display the rules under which you can copy and redistribute Emacs
+(@code{describe-copying}).
 @item C-h C-d
 Display help for debugging Emacs (@code{view-emacs-debugging}).
 @item C-h C-e
-Display external packages and information about Emacs
+Display information about where to get external packages
 (@code{view-external-packages}).
 @item C-h C-f
 Display the Emacs frequently-answered-questions list (@code{view-emacs-FAQ}).
 @item C-h g
-Display general information about the GNU Project
-(@code{describe-gnu-project}).
+Display information about the GNU Project (@code{describe-gnu-project}).
 @item C-h C-m
-Display how to order printed copies of Emacs manuals
+Display information about ordering printed copies of Emacs manuals
 (@code{view-order-manuals}).
 @item C-h C-n
-Display the Emacs ``news'' file, which lists new features in the most
-recent version of Emacs (@code{view-emacs-news}).
+Display the ``news'' file, which lists the new features in this
+version of Emacs (@code{view-emacs-news}).
 @item C-h C-o
 Display how to order or download the latest version of
 Emacs and other GNU software (@code{describe-distribution}).
@@ -672,20 +616,20 @@ Emacs (@code{describe-no-warranty}).
 
 @cindex tooltips
 @cindex balloon help
-  When text on the screen is ``active'', so that it does something
-special in response to mouse clicks or @kbd{RET}, it often has associated
-help text.  For instance, most parts of the mode line have help text.  On
-terminals that support mouse tracking, Emacs displays the help text as a
-``tooltip'' (sometimes known as ``balloon help'') or in the echo area,
-whenever you leave the mouse stationary over the active text.
+  In Emacs, stretches of ``active text'' (text that does something
+special in response to mouse clicks or @key{RET}) often have
+associated help text.  This includes hyperlinks in Emacs buffers, as
+well as parts of the mode line.  On graphical displays, as well as
+some text terminals which support mouse tracking, moving the mouse
+over the active text displays the help text as a @dfn{tooltip}.
 @xref{Tooltips}.
 
 @kindex C-h .
 @findex display-local-help
 @vindex help-at-pt-display-when-idle
-  If your terminal doesn't support mouse-tracking, you can display the
-help text for active buffer text using the keyboard.  @kbd{C-h .}
-(@code{display-local-help}) displays any help text associated with the
-character after point, using the echo area.  To display help text
-automatically whenever it is available on the character after point, set
-the variable @code{help-at-pt-display-when-idle} to @code{t}.
+  On terminals that don't support mouse-tracking, you can display the
+help text for active buffer text at point by typing @kbd{C-h .}
+(@code{display-local-help}).  This shows the help text in the echo
+area.  To display help text automatically whenever it is available at
+point, set the variable @code{help-at-pt-display-when-idle} to
+@code{t}.
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index da1e88ab331..e84b4c9f080 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -15,9 +15,9 @@ argument text.
 
 @cindex prompt
   When the minibuffer is in use, it appears in the echo area, with a
-cursor.  The minibuffer display starts with a @dfn{prompt} in a
-distinct color, usually ending with a colon.  The prompt states what
-kind of input is expected, and how it will be used.
+cursor.  The minibuffer starts with a @dfn{prompt} in a distinct
+color, usually ending with a colon.  The prompt states what kind of
+input is expected, and how it will be used.
 
   The simplest way to enter a minibuffer argument is to type the text,
 then @key{RET} to submit the argument and exit the minibuffer.  You
@@ -26,19 +26,17 @@ typing @kbd{C-g}.
 
 @cindex default argument
   Sometimes, a @dfn{default argument} appears in the prompt, inside
-parentheses before the colon.  The default will be used as the
-argument value if you just type @key{RET}.  For example, commands that
-read buffer names usually show a buffer name as the default; you can
-type @key{RET} to operate on that default buffer.
+parentheses before the colon.  This default will be used as the
+argument if you just type @key{RET}.  For example, commands that read
+buffer names usually show a buffer name as the default; you can type
+@key{RET} to operate on that default buffer.
 
   Since the minibuffer appears in the echo area, it can conflict with
-other uses of the echo area.  If an error occurs while the minibuffer
-is active, the error message hides the minibuffer for a few seconds,
-or until you type something; then the minibuffer comes back.  If a
-command such as @kbd{C-x =} needs to display a message in the echo
-area, the message hides the minibuffer for a few seconds, or until you
-type something; then the minibuffer comes back.  While the minibuffer
-is in use, keystrokes do not echo.
+other uses of the echo area.  If an error message or an informative
+message is emitted while the minibuffer is active, the message hides
+the minibuffer for a few seconds, or until you type something; then
+the minibuffer comes back.  While the minibuffer is in use, keystrokes
+do not echo.
 
 @menu
 * Minibuffer File::       Entering file names with the minibuffer.
@@ -52,6 +50,7 @@ is in use, keystrokes do not echo.
 @node Minibuffer File
 @section Minibuffers for File Names
 
+@cindex default directory
   Commands such as @kbd{C-x C-f} (@code{find-file}) use the minibuffer
 to read a file name argument (@pxref{Basic Files}).  When the
 minibuffer is used to read a file name, it typically starts out with
@@ -92,7 +91,7 @@ Emacs interprets a double slash as ``ignore everything before the
 second slash in the pair.''  In the example above,
 @file{/u2/emacs/src/} is ignored, so the argument you supplied is
 @file{/etc/termcap}.  The ignored part of the file name is dimmed if
-the terminal allows it (to disable this dimming, turn off File Name
+the terminal allows it.  (To disable this dimming, turn off File Name
 Shadow mode with the command @kbd{M-x file-name-shadow-mode}.)
 
 @cindex home directory shorthand
@@ -108,11 +107,11 @@ directory name in front of the @file{~} is ignored: thus,
 home directory, Emacs uses several alternatives.  For MS-Windows, see
 @ref{Windows HOME}; for MS-DOS, see
 @ifnottex
-@ref{MS-DOS File Names, HOME on MS-DOS}.
+@ref{MS-DOS File Names}.
 @end ifnottex
 @iftex
-@ref{MS-DOS File Names, HOME on MS-DOS,, emacs, the Emacs Manual}, in
-the main Emacs manual.
+@ref{MS-DOS File Names, HOME on MS-DOS,, emacs, the digital version of
+the Emacs Manual}.
 @end iftex
 On these systems, the @file{~@var{user-id}/} construct is supported
 only for the current user, i.e., only if @var{user-id} is the current
@@ -125,9 +124,8 @@ file names, change the variable @code{insert-default-directory} to
 Nonetheless, relative file name arguments are still interpreted based
 on the same default directory.
 
-  For rules how to read remote file names in the minibuffer, see
-@ref{Filename completion, file name completion,, tramp}, in the Tramp
-manual.
+  You can also enter remote file names in the minibuffer.
+@xref{Remote Files}.
 
 @node Minibuffer Edit
 @section Editing in the Minibuffer
@@ -136,17 +134,17 @@ manual.
 usual Emacs commands are available for editing the argument text.
 (The prompt, however, is @dfn{read-only}, and cannot be changed.)
 
-  Since @key{RET} in the minibuffer is defined to exit the minibuffer,
-you can't use it to insert a newline in the minibuffer.  To do that,
-type @kbd{C-o} or @kbd{C-q C-j}.  (The newline character is really the
-@acronym{ASCII} character control-J.)
+  Since @key{RET} in the minibuffer submits the argument, you can't
+use it to insert a newline.  You can do that with @kbd{C-q C-j}, which
+inserts a @kbd{C-j} control character, which is formally equivalent to
+a newline character (@pxref{Inserting Text}).  Alternatively, you can
+use the @kbd{C-o} (@code{open-line}) command (@pxref{Blank Lines}).
 
-  Inside a minibuffer, the keys @kbd{@key{TAB}}, @kbd{@key{SPC}}, and
-@kbd{@key{?}} are often bound to commands that perform
-@dfn{completion}.  @xref{Completion}.  You can use @kbd{C-q}
-(@code{quoted-insert}) to insert a @key{TAB}, @key{SPC}, or @key{?}
-character.  For example, @kbd{C-q @key{TAB}} inserts a @key{TAB}
-character.  @xref{Inserting Text}.
+  Inside a minibuffer, the keys @key{TAB}, @key{SPC}, and @kbd{?} are
+often bound to @dfn{completion commands}, which allow you to easily
+fill in the desired text without typing all of it.  @xref{Completion}.
+As with @key{RET}, you can use @kbd{C-q} to insert a @key{TAB},
+@key{SPC}, or @samp{?}  character.
 
   For convenience, @kbd{C-a} (@code{move-beginning-of-line}) in a
 minibuffer moves point to the beginning of the argument text, not the
@@ -203,35 +201,28 @@ set the variable @code{enable-recursive-minibuffers} to @code{t}.
 @c it, the tutorial needs to be adjusted.
 @cindex completion
 
-  Sometimes, you can use a feature called @dfn{completion} to help you
-enter arguments.  This means that after you type part of the argument,
-Emacs can fill in the rest, or some of it, based on what you have
-typed so far.
+  You can often use a feature called @dfn{completion} to help enter
+arguments.  This means that after you type part of the argument, Emacs
+can fill in the rest, or some of it, based on what was typed so far.
 
+@cindex completion alternative
   When completion is available, certain keys (usually @key{TAB},
-@key{RET}, and @key{SPC}) are rebound to complete the text in the
-minibuffer into a longer string chosen from a set of @dfn{completion
-alternatives}.  The set of completion alternatives depends on the
-command that requested the argument, and on what you have typed so
-far.  In addition, you can usually type @kbd{?} to display a list of
-possible completions.
-
-  For example, @kbd{M-x} uses the minibuffer to read the name of a
-command, so completion works by matching the minibuffer text against
-the names of existing Emacs commands.  So, to run the command
-@code{insert-buffer}, you can type @kbd{M-x ins @key{SPC} b @key{RET}}
-instead of the full @kbd{M-x insert-buffer @key{RET}}.
-
-  Case is significant in completion when it is significant in the
-argument you are entering, such as command names.  Thus,
-@samp{insert-buffer} is not a valid completion for @samp{IN}.
-Completion ignores case distinctions for certain arguments in which
-case does not matter.
+@key{RET}, and @key{SPC}) are rebound in the minibuffer to special
+completion commands (@pxref{Completion Commands}).  These commands
+attempt to complete the text in the minibuffer, based on a set of
+@dfn{completion alternatives} provided by the command that requested
+the argument.  You can usually type @kbd{?} to see a list of
+completion alternatives.
+
+  Although completion is usually done in the minibuffer, the feature
+is sometimes available in ordinary buffers too.  @xref{Symbol
+Completion}.
 
 @menu
 * Example: Completion Example.    Examples of using completion.
 * Commands: Completion Commands.  A list of completion commands.
 * Strict Completion::             Different types of completion.
+* Completion Styles::             How completion matches are chosen.
 * Options: Completion Options.    Options for completion.
 @end menu
 
@@ -239,24 +230,31 @@ case does not matter.
 @subsection Completion Example
 
 @kindex TAB @r{(completion)}
-  A concrete example may help here.  If you type @kbd{M-x a u
-@key{TAB}}, the @key{TAB} looks for alternatives (in this case,
-command names) that start with @samp{au}.  There are several,
-including @code{auto-fill-mode} and @code{autoconf-mode}, but they all
-begin with @code{auto}, so the @samp{au} in the minibuffer completes
-to @samp{auto}.
+  A simple example may help here.  @kbd{M-x} uses the minibuffer to
+read the name of a command, so completion works by matching the
+minibuffer text against the names of existing Emacs commands.  Suppose
+you wish to run the command @code{auto-fill-mode}.  You can do that by
+typing @kbd{M-x auto-fill-mode @key{RET}}, but it is easier to use
+completion.
+
+  If you type @kbd{M-x a u @key{TAB}}, the @key{TAB} looks for
+completion alternatives (in this case, command names) that start with
+@samp{au}.  There are several, including @code{auto-fill-mode} and
+@code{autoconf-mode}, but they all begin with @code{auto}, so the
+@samp{au} in the minibuffer completes to @samp{auto}.
 
   If you type @key{TAB} again immediately, it cannot determine the
 next character; it could be @samp{-}, @samp{a}, or @samp{c}.  So it
 does not add any characters; instead, @key{TAB} displays a list of all
 possible completions in another window.
 
-  Next, type @kbd{- f}.  The minibuffer now contains @samp{auto-f},
-and the only command name that starts with this is
-@code{auto-fill-mode}.  If you now type @key{TAB}, completion fills in
-the rest of the argument @samp{auto-fill-mode} into the minibuffer.
-You have been able to enter @samp{auto-fill-mode} by typing just
-@kbd{a u @key{TAB} - f @key{TAB}}.
+  Next, type @kbd{-f}.  The minibuffer now contains @samp{auto-f}, and
+the only command name that starts with this is @code{auto-fill-mode}.
+If you now type @key{TAB}, completion fills in the rest of the
+argument @samp{auto-fill-mode} into the minibuffer.
+
+  Hence, typing just @kbd{a u @key{TAB} - f @key{TAB}} allows you to
+enter @samp{auto-fill-mode}.
 
 @node Completion Commands
 @subsection Completion Commands
@@ -272,60 +270,24 @@ complete, display a list of possible completions
 (@code{minibuffer-complete}).
 @item @key{SPC}
 Complete up to one word from the minibuffer text before point
-(@code{minibuffer-complete-word}).  @key{SPC} for completion is not
-available when entering a file name, since file names often include
-spaces.
+(@code{minibuffer-complete-word}).  This command is not available for
+arguments that often include spaces, such as file names.
 @item @key{RET}
 Submit the text in the minibuffer as the argument, possibly completing
-first as described in the next
-@iftex
-subsection (@code{minibuffer-complete-and-exit}).
-@end iftex
-@ifnottex
-node (@code{minibuffer-complete-and-exit}).  @xref{Strict Completion}.
-@end ifnottex
+first (@code{minibuffer-complete-and-exit}).  @xref{Strict Completion}.
 @item ?
-Display a list of possible completions of the text before point
-(@code{minibuffer-completion-help}).
+Display a list of completions (@code{minibuffer-completion-help}).
 @end table
 
-@kindex TAB
+@kindex TAB @r{(completion)}
 @findex minibuffer-complete
   @key{TAB} (@code{minibuffer-complete}) is the most fundamental
-completion command.  It searches for all possible completion
-alternatives that match the existing minibuffer text, and attempts to
-complete as much as it can.  The matching of completion alternatives
-to the minibuffer text is performed according to somewhat intricate
-rules, which are designed so that plausible completions are offered
-under most circumstances.  A valid completion alternative must satisfy
-the following criteria:
+completion command.  It searches for all possible completions that
+match the existing minibuffer text, and attempts to complete as much
+as it can.  @xref{Completion Styles}, for how completion alternatives
+are chosen.
 
-@itemize @bullet
-@item
-The minibuffer text before point must be the same as the beginning of
-the completion alternative.  If there is any minibuffer text after
-point, it must be a substring of the remainder of the completion
-alternative.
-
-@item
-If no completion alternative satisfies the above rules, try using
-@dfn{partial completion} rules: divide the minibuffer text into words
-separated by hyphens or spaces, and complete each word separately.
-Thus, when completing command names, @samp{em-l-m} completes to
-@samp{emacs-lisp-mode}.
-
-@item
-If there is still no completion alternative, try the first rule again,
-but ignore the minibuffer text after point (i.e., don't try matching
-it).
-@end itemize
-
-@noindent
-When performing these comparisons, a @samp{*} in the minibuffer text
-acts as a @dfn{wildcard}---it matches any character at the
-corresponding position in the completion alternative.
-
-@kindex SPC
+@kindex SPC @r{(completion)}
 @findex minibuffer-complete-word
   @key{SPC} (@code{minibuffer-complete-word}) completes like
 @key{TAB}, but only up to the next hyphen or space.  If you have
@@ -334,50 +296,52 @@ completion is @samp{auto-fill-mode}, but it only inserts @samp{ill-},
 giving @samp{auto-fill-}.  Another @key{SPC} at this point completes
 all the way to @samp{auto-fill-mode}.
 
+@kindex ? @r{(completion)}
+@cindex completion list
   If @key{TAB} or @key{SPC} is unable to complete, it displays a list
-of possible completions (if there are any) in a separate window.  You
-can choose a completion from this list using the following commands:
+of matching completion alternatives (if there are any) in another
+window.  You can display the same list with @kbd{?}
+(@code{minibuffer-completion-help}).  The following commands can be
+used with the completion list:
 
 @table @kbd
 @findex mouse-choose-completion
 @item Mouse-1
 @itemx Mouse-2
-Clicking mouse button 1 or 2 on a completion possibility chooses that
-completion (@code{mouse-choose-completion}).
+Clicking mouse button 1 or 2 on a completion alternative chooses it
+(@code{mouse-choose-completion}).
 
 @findex switch-to-completions
 @item M-v
 @itemx @key{PageUp}
 @itemx @key{prior}
 Typing @kbd{M-v}, while in the minibuffer, selects the window showing
-the completion list buffer (@code{switch-to-completions}).  This paves
-the way for using the commands below.  Typing @key{PageUp} or
-@key{prior} does the same, as does selecting that window in other
-ways.
+the completion list (@code{switch-to-completions}).  This paves the
+way for using the commands below.  @key{PageUp} or @key{prior} does
+the same.  You can also select the window in other ways
+(@pxref{Windows}).
 
 @findex choose-completion
 @item @key{RET}
-Typing @key{RET}, while in the completion list buffer, chooses the
-completion that point is in or next to (@code{choose-completion}).  To
-use this command, you must first switch to the completion list window.
+While in the completion list buffer, this chooses the completion at
+point (@code{choose-completion}).
 
 @findex next-completion
 @item @key{Right}
-Typing the right-arrow key @key{Right}, while in the completion list
-buffer, moves point to the following completion possibility
-(@code{next-completion}).
+While in the completion list buffer, this moves point to the following
+completion alternative (@code{next-completion}).
 
 @findex previous-completion
 @item @key{Left}
-Typing the left-arrow key @key{Left}, while in the completion list
-buffer, moves point to the previous completion possibility
-(@code{previous-completion}).
+While in the completion list buffer, this moves point to the previous
+completion alternative (@code{previous-completion}).
 @end table
 
 @node Strict Completion
 @subsection Strict Completion
 
-  There are three different ways that @key{RET} can do completion,
+  There are three ways that the @key{RET}
+(@code{minibuffer-complete-and-exit}) completion command can act,
 depending on how the argument will be used.
 
 @itemize @bullet
@@ -406,67 +370,140 @@ completion, @key{RET} does not complete, it just submits the argument
 as you have entered it.
 @end itemize
 
-  The completion commands display a list of all possible completions
-whenever they can't determine even one more character by completion.
-Also, typing @kbd{?} explicitly requests such a list.  You can scroll
-the list with @kbd{C-M-v} (@pxref{Other Window}).
+  Like the other completion commands, @key{RET} displays a list of all
+possible completions whenever it is supposed to complete but is unable
+to complete any further.
 
-@node Completion Options
-@subsection Completion Options
+@node Completion Styles
+@subsection How Completion Alternatives Are Chosen
+@cindex completion style
 
-@vindex completion-auto-help
-  If @code{completion-auto-help} is set to @code{nil}, the completion
-commands never display the completion list buffer; you must type
-@kbd{?}  to display the list.  If the value is @code{lazy}, Emacs only
-shows the completion list buffer on the second attempt to complete.
-In other words, if there is nothing to complete, the first @key{TAB}
-echoes @samp{Next char not unique}; the second @key{TAB} does the
-completion list buffer.
+  Completion commands work by narrowing a large list of possible
+completion alternatives to a smaller subset that ``matches'' what you
+have typed in the minibuffer.  In @ref{Completion Example}, we gave a
+simple example of such matching.  The procedure of determining what
+constitutes a ``match'' is quite intricate.  Emacs attempts to offer
+plausible completions under most circumstances.
 
-@vindex completion-ignored-extensions
-@cindex ignored file names, in completion
-  When completing file names, certain file names are usually ignored.
-The variable @code{completion-ignored-extensions} contains a list of
-strings; a file name ending in any of those strings is ignored as a
-completion candidate.  The standard value of this variable has several
-elements including @code{".o"}, @code{".elc"}, and @code{"~"}.  For
-example, if a directory contains @samp{foo.c} and @samp{foo.elc},
-@samp{foo} completes to @samp{foo.c}.  However, if @emph{all} possible
-completions end in ``ignored'' strings, they are not ignored: in the
-previous example, @samp{foo.e} completes to @samp{foo.elc}.
-Displaying a list of possible completions disregards
-@code{completion-ignored-extensions}; it shows them all.
+  Emacs performs completion using one or more @dfn{completion
+styles}---sets of criteria for matching minibuffer text to completion
+alternatives.  During completion, Emacs tries each completion style in
+turn.  If a style yields one or more matches, that is used as the list
+of completion alternatives.  If a style produces no matches, Emacs
+falls back on the next style.
 
-  If an element of @code{completion-ignored-extensions} ends in a
-slash (@file{/}), it's a subdirectory name; that directory and its
-contents are ignored.  Elements of
-@code{completion-ignored-extensions} that do not end in a slash are
-ordinary file names.
+@vindex completion-styles
+  The list variable @code{completion-styles} specifies the completion
+styles to use.  Each list element is the name of a completion style (a
+Lisp symbol).  The default completion styles are (in order):
+
+@table @code
+@item basic
+A matching completion alternative must have the same beginning as the
+text in the minibuffer before point.  Furthermore, if there is any
+text in the minibuffer after point, the rest of the completion
+alternative must contain that text as a substring.
+
+@findex partial completion
+@item partial-completion
+This aggressive completion style divides the minibuffer text into
+words separated by hyphens or spaces, and completes each word
+separately.  (For example, when completing command names,
+@samp{em-l-m} completes to @samp{emacs-lisp-mode}.)
+
+Furthermore, a @samp{*} in the minibuffer text is treated as a
+@dfn{wildcard}---it matches any character at the corresponding
+position in the completion alternative.
+
+@item emacs22
+This completion style is similar to @code{basic}, except that it
+ignores the text in the minibuffer after point.  It is so-named
+because it corresponds to the completion behavior in Emacs 22 and
+earlier.
+@end table
+
+@noindent
+The following additional completion styles are also defined, and you
+can add them to @code{completion-styles} if you wish
+(@pxref{Customization}):
+
+@table @code
+@item substring
+A matching completion alternative must contain the text in the
+minibuffer before point, and the text in the minibuffer after point,
+as substrings (in that same order).
+
+Thus, if the text in the minibuffer is @samp{foobar}, with point
+between @samp{foo} and @samp{bar}, that matches
+@samp{@var{a}foo@var{b}bar@var{c}}, where @var{a}, @var{b}, and
+@var{c} can be any string including the empty string.
+
+@item initials
+This very aggressive completion style attempts to complete acronyms
+and initialisms.  For example, when completing command names, it
+matches @samp{lch} to @samp{list-command-history}.
+@end table
+
+@node Completion Options
+@subsection Completion Options
 
 @cindex case-sensitivity and completion
+@cindex case in completion
+  Case is significant when completing case-sensitive arguments, such
+as command names.  For example, when completing command names,
+@samp{AU} does not complete to @samp{auto-fill-mode}.  Case
+differences are ignored when completing arguments in which case does
+not matter.
+
 @vindex read-file-name-completion-ignore-case
 @vindex read-buffer-completion-ignore-case
-  When completing file names, Emacs ignores case differences if the
+  When completing file names, case differences are ignored if the
 variable @code{read-file-name-completion-ignore-case} is
 non-@code{nil}.  The default value is @code{nil} on systems that have
 case-sensitive file-names, such as GNU/Linux; it is non-@code{nil} on
 systems that have case-insensitive file-names, such as Microsoft
-Windows.  When completing buffer names, Emacs ignores case differences
-if @code{read-buffer-completion-ignore-case} is non-@code{nil} (the
-default value is @code{nil}).
+Windows.  When completing buffer names, case differences are ignored
+if the variable @code{read-buffer-completion-ignore-case} is
+non-@code{nil}; the default is @code{nil}.
 
-@vindex completion-styles
-  You can customize the matching rules for completion alternatives
-using the variable @code{completion-styles}.  Its value should be a
-list of symbols, each representing a @dfn{completion style}; valid
-style symbols are @code{basic}, @code{partial-completion},
-@code{emacs22}, @code{emacs21}, and @code{initials}.  When completing,
-Emacs attempts to use the first completion style in the list; if this
-does not return any completion alternatives, it tries the next
-completion style in the list, and so on.  The completion rules
-described in @ref{Completion Commands} correspond to the default value
-of @code{completion-styles}, which is @code{(basic partial-completion
-emacs22)}.
+@vindex completion-ignored-extensions
+@cindex ignored file names, in completion
+  When completing file names, Emacs usually omits certain alternatives
+that are considered unlikely to be chosen, as determined by the list
+variable @code{completion-ignored-extensions}.  Each element in the
+list should be a string; any file name ending in such a string is
+ignored as a completion alternative.  Any element ending in a slash
+(@file{/}) represents a subdirectory name.  The standard value of
+@code{completion-ignored-extensions} has several elements including
+@code{".o"}, @code{".elc"}, and @code{"~"}.  For example, if a
+directory contains @samp{foo.c} and @samp{foo.elc}, @samp{foo}
+completes to @samp{foo.c}.  However, if @emph{all} possible
+completions end in ``ignored'' strings, they are not ignored: in the
+previous example, @samp{foo.e} completes to @samp{foo.elc}.  Emacs
+disregards @code{completion-ignored-extensions} when showing
+completion alternatives in the completion list.
+
+@vindex completion-auto-help
+  If @code{completion-auto-help} is set to @code{nil}, the completion
+commands never display the completion list buffer; you must type
+@kbd{?}  to display the list.  If the value is @code{lazy}, Emacs only
+shows the completion list buffer on the second attempt to complete.
+In other words, if there is nothing to complete, the first @key{TAB}
+echoes @samp{Next char not unique}; the second @key{TAB} does the
+completion list buffer.
+
+@vindex completion-cycle-threshold
+  If @code{completion-cycle-threshold} is non-@code{nil}, completion
+commands can ``cycle'' through completion alternatives.  Normally, if
+there is more than one completion alternative for the text in the
+minibuffer, a completion command completes up to the longest common
+substring.  If you change @code{completion-cycle-threshold} to
+@code{t}, the completion command instead completes to the first of
+those completion alternatives; each subsequent invocation of the
+completion command replaces that with the next completion alternative,
+in a cyclic manner.  If you give @code{completion-cycle-threshold} a
+numeric value @var{n}, completion commands switch to this cycling
+behavior only when there are fewer than @var{n} alternatives.
 
 @cindex Icomplete mode
 @findex icomplete-mode
@@ -504,64 +541,60 @@ Move to a later item in the minibuffer history that matches
 
 @kindex M-p @r{(minibuffer history)}
 @kindex M-n @r{(minibuffer history)}
+@kindex UP @r{(minibuffer history)}
+@kindex DOWN @r{(minibuffer history)}
 @findex next-history-element
 @findex previous-history-element
-  While in the minibuffer, typing @kbd{M-p} or @key{Up}
-(@code{previous-history-element}) moves up through the minibuffer
-history list, one item at a time.  Each @kbd{M-p} fetches an earlier
-item from the history list into the minibuffer, replacing its existing
-contents.  Similarly, typing @kbd{M-n} or @key{Down}
-(@code{next-history-element}) moves back down the history list,
-fetching later entries into the minibuffer.  You can think of these
-commands as ``backwards'' and ``forwards'' through the history list.
+  While in the minibuffer, @kbd{M-p} or @key{Up}
+(@code{previous-history-element}) moves through the minibuffer history
+list, one item at a time.  Each @kbd{M-p} fetches an earlier item from
+the history list into the minibuffer, replacing its existing contents.
+Typing @kbd{M-n} or @key{Down} (@code{next-history-element}) moves
+through the minibuffer history list in the opposite direction,
+fetching later entries into the minibuffer.
 
   If you type @kbd{M-n} in the minibuffer when there are no later
 entries in the minibuffer history (e.g., if you haven't previously
 typed @kbd{M-p}), Emacs tries fetching from a list of default
-argument: values that you are likely to enter.  You can think of this
-as moving through the ``future list'' instead of the ``history list''.
+arguments: values that you are likely to enter.  You can think of this
+as moving through the ``future history'' list.
 
-  The input that @kbd{M-p} or @kbd{M-n} fetches into the minibuffer
-entirely replaces the existing contents of the minibuffer, so you can
-simply type @key{RET} to use it as an argument.  You can also edit the
-text before you reuse it; this does not change the history element
-that you ``moved'' to, but your new argument does go at the end of the
-history list in its own right.
+  If you edit the text inserted by the @kbd{M-p} or @key{M-n}
+minibuffer history commands, this does not change its entry in the
+history list.  However, the edited argument does go at the end of the
+history list when you submit it.
 
 @findex previous-matching-history-element
 @findex next-matching-history-element
 @kindex M-r @r{(minibuffer history)}
 @kindex M-s @r{(minibuffer history)}
-  There are also commands to search forward or backward through the
-history; they search for history elements that match a regular
-expression.  @kbd{M-r} (@code{previous-matching-history-element})
-searches older elements in the history, while @kbd{M-s}
-(@code{next-matching-history-element}) searches newer elements.  These
-commands are unusual: they use the minibuffer to read the regular
-expression even though they are invoked from the minibuffer.  As with
-incremental searching, an upper-case letter in the regular expression
-makes the search case-sensitive (@pxref{Search Case}).  You can also
-search through the history using an incremental search (@pxref{Isearch
-Minibuffer}).
-
-  All uses of the minibuffer record your input on a history list, but
-there are separate history lists for different kinds of arguments.
-For example, there is a list for file names, used by all the commands
-that read file names.  (As a special feature, this history list
-records the absolute file name, even if the name you entered was not
-absolute.)
-
-  There are several other specific history lists, including one for
-buffer names, one for arguments of commands like @code{query-replace},
-one used by @kbd{M-x} for command names, and one used by
-@code{compile} for compilation commands.  Finally, there is one
-``miscellaneous'' history list that most minibuffer arguments use.
+  You can use @kbd{M-r} (@code{previous-matching-history-element}) to
+search through older elements in the history list, and @kbd{M-s}
+(@code{next-matching-history-element}) to search through newer
+entries.  Each of these commands asks for a @dfn{regular expression}
+as an argument, and fetches the first matching entry into the
+minibuffer.  @xref{Regexps}, for an explanation of regular
+expressions.  A numeric prefix argument @var{n} means to fetch the
+@var{n}th matching entry.  These commands are unusual, in that they
+use the minibuffer to read the regular expression argument, even
+though they are invoked from the minibuffer.  An upper-case letter in
+the regular expression makes the search case-sensitive (@pxref{Search
+Case}).
+
+  You can also search through the history using an incremental search.
+@xref{Isearch Minibuffer}.
+
+  Emacs keeps separate history lists for several different kinds of
+arguments.  For example, there is a list for file names, used by all
+the commands that read file names.  Other history lists include buffer
+names, command names (used by @kbd{M-x}), and command arguments (used
+by commands like @code{query-replace}).
 
 @vindex history-length
   The variable @code{history-length} specifies the maximum length of a
 minibuffer history list; adding a new element deletes the oldest
-element if the list gets too long.  If the value of
-@code{history-length} is @code{t}, there is no maximum length.
+element if the list gets too long.  If the value is @code{t}, there is
+no maximum length.
 
 @vindex history-delete-duplicates
   The variable @code{history-delete-duplicates} specifies whether to
@@ -592,27 +625,25 @@ Display the entire command history, showing all the commands
 
 @kindex C-x ESC ESC
 @findex repeat-complex-command
-  @kbd{C-x @key{ESC} @key{ESC}} is used to re-execute a recent command
-that used the minibuffer.  With no argument, it repeats the last such
-command.  A numeric argument specifies which command to repeat; 1
-means the last one, 2 the previous, and so on.
+  @kbd{C-x @key{ESC} @key{ESC}} re-executes a recent command that used
+the minibuffer.  With no argument, it repeats the last such command.
+A numeric argument specifies which command to repeat; 1 means the last
+one, 2 the previous, and so on.
 
   @kbd{C-x @key{ESC} @key{ESC}} works by turning the previous command
 into a Lisp expression and then entering a minibuffer initialized with
-the text for that expression.  Even if you don't understand Lisp
-syntax, it will probably be obvious which command is displayed for
-repetition.  If you type just @key{RET}, that repeats the command
-unchanged.  You can also change the command by editing the Lisp
-expression before you execute it.  The repeated command is added to
-the front of the command history unless it is identical to the most
-recent item.
-
-  Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you can
-use the minibuffer history commands (@kbd{M-p}, @kbd{M-n}, @kbd{M-r},
-@kbd{M-s}; @pxref{Minibuffer History}) to move through the history list
-of saved entire commands.  After finding the desired previous command,
-you can edit its expression as usual and then repeat it by typing
-@key{RET}.
+the text for that expression.  Even if you don't know Lisp, it will
+probably be obvious which command is displayed for repetition.  If you
+type just @key{RET}, that repeats the command unchanged.  You can also
+change the command by editing the Lisp expression before you execute
+it.  The repeated command is added to the front of the command history
+unless it is identical to the most recent item.
+
+  Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you
+can use the usual minibuffer history commands (@pxref{Minibuffer
+History}) to move through the history list.  After finding the desired
+previous command, you can edit its expression as usual and then repeat
+it by typing @key{RET}.
 
 @vindex isearch-resume-in-command-history
   Incremental search does not, strictly speaking, use the minibuffer.
@@ -637,12 +668,11 @@ when you tell Emacs to visit a file on another machine via a network
 protocol such as FTP, you often need to supply a password to gain
 access to the machine (@pxref{Remote Files}).
 
-  Entering a password is, in a basic sense, similar to using a
-minibuffer.  Emacs displays a prompt in the echo area (such as
-@samp{Password: }); after you type the required password, press
-@key{RET} to submit it.  To prevent others from seeing your password,
-every character you type is displayed as a dot (@samp{.}) instead of
-its usual form.
+  Entering a password is similar to using a minibuffer.  Emacs
+displays a prompt in the echo area (such as @samp{Password: }); after
+you type the required password, press @key{RET} to submit it.  To
+prevent others from seeing your password, every character you type is
+displayed as a dot (@samp{.}) instead of its usual form.
 
   Most of the features and commands associated with the minibuffer can
 @emph{not} be used when entering a password.  There is no history or
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 598f495784f..d7639b3b665 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1531,8 +1531,8 @@ Specify a command to run if @code{emacsclient} fails to contact Emacs.
 This is useful when running @code{emacsclient} in a script.
 
 As a special exception, if @var{command} is the empty string, then
-@code{emacsclient} starts Emacs in daemon mode and then tries
-connecting again.
+@code{emacsclient} starts Emacs in daemon mode (as @command{emacs
+--daemon}) and then tries connecting again.
 
 @cindex @env{ALTERNATE_EDITOR} environment variable
 The environment variable @env{ALTERNATE_EDITOR} has the same effect as
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 4f1683ef5ea..29b6c69e38f 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1707,10 +1707,9 @@ directionality when they are displayed.  The default value is
 
   Each paragraph of bidirectional text can have its own @dfn{base
 direction}, either right-to-left or left-to-right.  (Paragraph
-boundaries are defined by the regular expressions
-@code{paragraph-start} and @code{paragraph-separate}, see
-@ref{Paragraphs}.)  Text in left-to-right paragraphs begins at the
-left margin of the window and is truncated or continued when it
+boundaries are empty lines, i.e.@: lines consisting entirely of
+whitespace characters.)  Text in left-to-right paragraphs begins at
+the left margin of the window and is truncated or continued when it
 reaches the right margin.  By contrast, text in right-to-left
 paragraphs begins at the right margin and is continued or truncated at
 the left margin.
@@ -1734,8 +1733,8 @@ The special character @code{RIGHT-TO-LEFT MARK}, or @sc{rlm}, forces
 the right-to-left direction on the following paragraph, while
 @code{LEFT-TO-RIGHT MARK}, or @sc{lrm} forces the left-to-right
 direction.  (You can use @kbd{C-x 8 RET} to insert these characters.)
-In a GUI session, the @sc{lrm} and @sc{rlm} characters display as
-blanks.
+In a GUI session, the @sc{lrm} and @sc{rlm} characters display as very
+thin blank characters; on text terminals they display as blanks.
 
   Because characters are reordered for display, Emacs commands that
 operate in the logical order or on stretches of buffer positions may
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 59f65fac8af..14d4c678085 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -5,31 +5,35 @@
 @node Screen, User Input, Acknowledgments, Top
 @chapter The Organization of the Screen
 @cindex screen
-@cindex parts of the screen
-
-  On a text-only terminal, the Emacs display occupies the entire
-terminal screen.  On a graphical display, such as on GNU/Linux using
-the X Window System, Emacs creates its own windows to use.  We use the
-term @dfn{frame} to mean the entire terminal screen or graphical
-window used by Emacs.  Emacs uses both kinds of frames, in the same
-way, to display your editing.  Emacs normally starts out with just one
-frame, but you can create additional frames if you wish
-(@pxref{Frames}).
-
-  The frame consists of several distinct regions.  At the top of the
+@cindex frame
+
+  On a graphical display, such as on GNU/Linux using the X Window
+System, Emacs occupies a ``graphical window''.  On a text-only
+terminal, Emacs occupies the entire terminal screen.  We will use the
+term @dfn{frame} to mean a graphical window or terminal screen
+occupied by Emacs.  Emacs behaves very similarly on both kinds of
+frames.  It normally starts out with just one frame, but you can
+create additional frames if you wish (@pxref{Frames}).
+
+  Each frame consists of several distinct regions.  At the top of the
 frame is a @dfn{menu bar}, which allows you to access commands via a
 series of menus.  On a graphical display, directly below the menu bar
 is a @dfn{tool bar}, a row of icons that perform editing commands if
-you click on them.  At the very bottom of the frame is a special
-@dfn{echo area}, where short informative messages are displayed and
-where you enter information when Emacs asks for it.
+you click on them.  At the very bottom of the frame is an @dfn{echo
+area}, where informative messages are displayed and where you enter
+information when Emacs asks for it.
 
   The main area of the frame, below the tool bar (if one exists) and
-above the echo area, is called @dfn{the window}.  This is where Emacs
-displays the @dfn{buffer}: the text that you are editing.  On a
-graphical display, the window possesses a @dfn{scroll bar} on one
-side, which you can use to display different parts of the buffer in
-the window.  The last line of the window is a @dfn{mode line}.  This
+above the echo area, is called @dfn{the window}.  Henceforth in this
+manual, we will use the word ``window'' in this sense.  Graphical
+display systems commonly use the word ``window'' with a different
+meaning; but, as stated above, we refer to those ``graphical windows''
+as ``frames''.
+
+  An Emacs window is where the @dfn{buffer}---the text you are
+editing---is displayed.  On a graphical display, the window possesses
+a @dfn{scroll bar} on one side, which can be used to scroll through
+the buffer.  The last line of the window is a @dfn{mode line}.  This
 displays various information about what is going on in the buffer,
 such as whether there are unsaved changes, the editing modes that are
 in use, the current line number, and so forth.
@@ -37,20 +41,18 @@ in use, the current line number, and so forth.
   When you start Emacs, there is normally only one window in the
 frame.  However, you can subdivide this window horizontally or
 vertically to create multiple windows, each of which can independently
-display a buffer (@pxref{Windows}).  In this manual, the word
-``window'' refers to the initial large window if not subdivided, or
-any one of the multiple windows you have subdivided it into.
-
-  At any time, one window is the @dfn{selected window}.  On graphical
-displays, the selected window normally shows a more prominent cursor
-(usually solid and blinking) while other windows show a weaker cursor
-(such as a hollow box).  Text terminals have just one cursor, so it
-always appears in the selected window.  The buffer displayed in the
-selected window is called the @dfn{current buffer}, and it is where
-editing happens.  Most Emacs commands implicitly apply to the current
-buffer; the text displayed in unselected windows is mostly visible for
-reference.  If you use multiple frames on a graphical display,
-selecting a particular frame selects a window in that frame.
+display a buffer (@pxref{Windows}).
+
+  At any time, one window is the @dfn{selected window}.  On a
+graphical display, the selected window shows a more prominent cursor
+(usually solid and blinking); other windows show a less prominent
+cursor (usually a hollow box).  On a text terminal, there is only one
+cursor, which is shown in the selected window.  The buffer displayed
+in the selected window is called the @dfn{current buffer}, and it is
+where editing happens.  Most Emacs commands implicitly apply to the
+current buffer; the text displayed in unselected windows is mostly
+visible for reference.  If you use multiple frames on a graphical
+display, selecting a particular frame selects a window in that frame.
 
 @menu
 * Point::             The place in the text where editing commands operate.
@@ -64,42 +66,33 @@ selecting a particular frame selects a window in that frame.
 @cindex point
 @cindex cursor
 
-  The active cursor shows the location at which editing commands will
-take effect, which is called @dfn{point}@footnote{The term ``point''
-comes from the character @samp{.}, which was the command in TECO (the
-language in which the original Emacs was written) for accessing the
-value now called ``point.''}.  Many Emacs commands move point to
-different places in the buffer; for example, you can place point by
+  The cursor in the selected window shows the location where most
+editing commands take effect, which is called @dfn{point}@footnote{The
+term ``point'' comes from the character @samp{.}, which was the
+command in TECO (the language in which the original Emacs was written)
+for accessing the editing position.}.  Many Emacs commands move point
+to different places in the buffer; for example, you can place point by
 clicking mouse button 1 (normally the left button) at the desired
 location.
 
-  If you use a block cursor, the cursor appears to be @emph{on} a
-character, but you should think of point as @emph{between} two
-characters; it points @emph{before} the character that appears under
-the cursor.  For example, if your text looks like @samp{frob} with the
-cursor over the @samp{b}, then point is between the @samp{o} and the
-@samp{b}.  If you insert the character @samp{!} at that position, the
-result is @samp{fro!b}, with point between the @samp{!} and the
-@samp{b}.  Thus, the cursor remains over the @samp{b}, as before.
-
-  Sometimes people speak of ``the cursor'' when they mean ``point,'' or
-speak of commands that move point as ``cursor motion'' commands.
+  By default, the cursor in the selected window is drawn as a solid
+block and appears to be @emph{on} a character, but you should think of
+point as @emph{between} two characters; it is situated @emph{before}
+the character under the cursor.  For example, if your text looks like
+@samp{frob} with the cursor over the @samp{b}, then point is between
+the @samp{o} and the @samp{b}.  If you insert the character @samp{!}
+at that position, the result is @samp{fro!b}, with point between the
+@samp{!}  and the @samp{b}.  Thus, the cursor remains over the
+@samp{b}, as before.
 
   If you are editing several files in Emacs, each in its own buffer,
-each buffer has its own point location.  A buffer that is not
-currently displayed remembers its point location in case you display
-it again later.  When Emacs displays multiple windows, each window has
-its own point location.  If the same buffer appears in more than one
-window, each window has its own point position in that buffer.
-
-  On a graphical display, Emacs shows a cursor in each window.  The
-selected window's cursor will be blinking.  If you use the default,
-@code{box} cursor type, the selected window's cursor will be solid,
-and the other cursors are hollow.  On a text-only terminal, there is
-just one cursor, in the selected window; even though the unselected
-windows have their own point positions, they do not display a cursor.
-@xref{Cursor Display}, for customizable variables that control cursor
-display.
+each buffer has its own value of point.  A buffer that is not
+currently displayed remembers its value of point if you later display
+it again.  Furthermore, if a buffer is displayed in multiple windows,
+each of those windows has its own value of point.
+
+  @xref{Cursor Display}, for options that control how Emacs displays
+the cursor.
 
 @node Echo Area
 @section The Echo Area
@@ -108,40 +101,41 @@ display.
   The line at the very bottom of the frame is the @dfn{echo area}.  It
 is used to display small amounts of text for various purposes.
 
-  @dfn{Echoing} means displaying the characters that you type.
-Single-character commands, including most simple editing operations,
-are not echoed.  Multi-character commands are echoed if you pause
-while typing them: if you pause for more than a second in the middle
-of a command, Emacs echoes all the characters of the command so far,
-to prompt you for the rest of the command.  The echoed characters are
-displayed in the echo area.  Once echoing has started, the rest of the
-command echoes immediately as you type it.  This behavior is designed
-to give confident users fast response, while giving hesitant users
-maximum feedback.  @xref{Display Custom}.
-
-@cindex error message in the echo area
-  If a command cannot do its job, it may display an @dfn{error
-message}.  Error messages are also displayed in the echo area.  They
-may be accompanied by beeping or by flashing the screen.
-
-  Some commands display informative messages in the echo area.  Unlike
-error messages, these messages are not announced with a beep or flash.
-Sometimes the message tells you what the command has done, when this
-is not obvious from looking at the text being edited.  Other times,
-the sole purpose of a command is to show you a message giving you
-specific information.  For example, @kbd{C-x =} (hold down @key{CTRL}
-and type @kbd{x}, then let go of @key{CTRL} and type @kbd{=}) displays
-a message describing the character position of point in the text and
-its current column in the window.  Commands that take a long time
-often display messages ending in @samp{...} while they are working,
-and add @samp{done} at the end when they are finished.  They may also
-indicate progress with percentages.
+@cindex echoing
+  The echo area is so-named because one of the things it is used for
+is @dfn{echoing}, which means displaying the characters of a
+multi-character command as you type.  Single-character commands are
+not echoed.  Multi-character commands (@pxref{Keys}) are echoed if you
+pause for more than a second in the middle of a command.  Emacs then
+echoes all the characters of the command so far, to prompt you for the
+rest.  Once echoing has started, the rest of the command echoes
+immediately as you type it.  This behavior is designed to give
+confident users fast response, while giving hesitant users maximum
+feedback.
+
+@cindex error message
+@cindex echo area message
+  The echo area is also used to display an @dfn{error message} when a
+command cannot do its job.  Error messages may be accompanied by
+beeping or by flashing the screen.
+
+  Some commands display informative messages in the echo area to tell
+you what the command has done, or to provide you with some specific
+information.  These @dfn{informative} messages, unlike error messages,
+are not accompanied with a beep or flash.  For example, @kbd{C-x =}
+(hold down @key{CTRL} and type @kbd{x}, then let go of @key{CTRL} and
+type @kbd{=}) displays a message describing the character at point,
+its position in the buffer, and its current column in the window.
+Commands that take a long time often display messages ending in
+@samp{...} while they are working (sometimes also indicating how much
+progress has been made, as a percentage), and add @samp{done} when
+they are finished.
 
 @cindex @samp{*Messages*} buffer
 @cindex saved echo area messages
 @cindex messages saved from echo area
 @vindex message-log-max
-  Informative echo-area messages are saved in a special buffer named
+  Informative echo area messages are saved in a special buffer named
 @samp{*Messages*}.  (We have not explained buffers yet; see
 @ref{Buffers}, for more information about them.)  If you miss a
 message that appeared briefly on the screen, you can switch to the
@@ -152,15 +146,17 @@ either; see @ref{Variables}, for more information about them.)  Beyond
 this limit, one line is deleted from the beginning whenever a new
 message line is added at the end.
 
+  @xref{Display Custom}, for options that control how Emacs uses the
+echo area.
+
 @cindex minibuffer
   The echo area is also used to display the @dfn{minibuffer}, a
 special window where you can input arguments to commands, such as the
 name of a file to be edited.  When the minibuffer is in use, the text
-displayed in the echo area begins with a @dfn{prompt string} (usually
-ending with a colon); also, the active cursor appears within the
-minibuffer, which is temporarily considered the selected window.  You
-can always get out of the minibuffer by typing @kbd{C-g}.
-@xref{Minibuffer}.
+displayed in the echo area begins with a @dfn{prompt string}, and the
+active cursor appears within the minibuffer, which is temporarily
+considered the selected window.  You can always get out of the
+minibuffer by typing @kbd{C-g}.  @xref{Minibuffer}.
 
 @node Mode Line
 @section The Mode Line
@@ -171,47 +167,51 @@ can always get out of the minibuffer by typing @kbd{C-g}.
 what is going on in the current buffer.  When there is only one
 window, the mode line appears right above the echo area; it is the
 next-to-last line in the frame.  On a graphical display, the mode line
-is drawn with a 3D box appearance, and the mode line of the selected
-window has a brighter color than that of unselected windows to make it
-stand out.  On a text-only terminal, the mode line is usually drawn in
-inverse video.
+is drawn with a 3D box appearance.  Emacs also usually draws the mode
+line of the selected window with a different color than that of
+unselected windows, in order to make it stand out.
 
   The text displayed in the mode line has the following format:
 
 @example
--@var{cs}:@var{ch}-@var{fr}  @var{buf}      @var{pos} @var{line}   (@var{major} @var{minor})------
+ @var{cs}:@var{ch}-@var{fr}  @var{buf}      @var{pos} @var{line}   (@var{major} @var{minor})
 @end example
 
 @noindent
+On a text-only terminal, this text is followed by a series of dashes
+extending to the right edge of the window.  These dashes are omitted
+on a graphical display.
+
 The @var{cs} string and the colon character after it describe the
 character set and newline convention used for the current buffer.
-Normally, Emacs handles these settings intelligently, but it is
-sometimes useful to have this information.
-
-  @var{cs} describes the character set of the buffer (@pxref{Coding
-Systems}).  If it is a dash (@samp{-}), that indicates the default
-state of affairs: no special character set handling, except for the
-end-of-line translations described in the next paragraph.  @samp{=}
-means no conversion whatsoever.  Characters represent various nontrivial
+Normally, Emacs automatically handles these settings for you, but it
+is sometimes useful to have this information.
+
+  @var{cs} describes the character set of the text in the buffer
+(@pxref{Coding Systems}).  If it is a dash (@samp{-}), that indicates
+no special character set handling (with the possible expection of
+end-of-line conventions, described in the next paragraph).  @samp{=}
+means no conversion whatsoever, and is usually used for files
+containing non-textual data.  Other characters represent various
 @dfn{coding systems}---for example, @samp{1} represents ISO Latin-1.
-On a text-only terminal, @var{cs} is preceded by two additional
-characters that describe the coding system for keyboard input and the
-coding system for terminal output.  Furthermore, if you are using an
-input method, @var{cs} is preceded by a string that identifies the
-input method, which takes the form @samp{@var{i}>}, @samp{@var{i}+},
-or @samp{@var{i}@@} (@pxref{Input Methods}).
-
-@cindex end-of-line conversion, mode-line indication
-  The character after @var{cs} is usually a colon.  However, under
-some circumstances a different string is displayed, which indicates a
-nontrivial end-of-line convention.  Usually, lines of text are
-separated by @dfn{newline characters}, but two other conventions are
-sometimes used.  The MS-DOS convention is to use a ``carriage-return''
+
+  On a text-only terminal, @var{cs} is preceded by two additional
+characters that describe the coding systems for keyboard input and
+terminal output.  Furthermore, if you are using an input method,
+@var{cs} is preceded by a string that identifies the input method
+(@pxref{Input Methods}).
+
+@cindex end-of-line convention, mode-line indication
+  The character after @var{cs} is usually a colon.  If a different
+string is displayed, that indicates a nontrivial end-of-line
+convention for encoding a file.  Usually, lines of text are separated
+by @dfn{newline characters} in a file, but two other conventions are
+sometimes used.  The MS-DOS convention uses a ``carriage-return''
 character followed by a ``linefeed'' character; when editing such
 files, the colon changes to either a backslash (@samp{\}) or
-@samp{(DOS)}, depending on the operating system.  The Macintosh
-end-of-line convention is to use a ``carriage-return'' character
-instead of a newline; when editing such files, the colon indicator
+@samp{(DOS)}, depending on the operating system.  Another convention,
+employed by older Macintosh systems, uses a ``carriage-return''
+character instead of a newline; when editing such files, the colon
 changes to either a forward slash (@samp{/}) or @samp{(Mac)}.  On some
 systems, Emacs displays @samp{(Unix)} instead of the colon for files
 that use newline as the line separator.
@@ -234,14 +234,14 @@ only on text-only terminals.  The initial frame's name is @samp{F1}.
 Usually, this is the same as the name of a file you are editing.
 @xref{Buffers}.
 
-  @var{pos} tells you whether there is additional text above the top of
-the window, or below the bottom.  If your buffer is small and it is all
-visible in the window, @var{pos} is @samp{All}.  Otherwise, it is
-@samp{Top} if you are looking at the beginning of the buffer, @samp{Bot}
-if you are looking at the end of the buffer, or @samp{@var{nn}%}, where
-@var{nn} is the percentage of the buffer above the top of the window.
-With Size Indication mode, you can display the size of the buffer as
-well.  @xref{Optional Mode Line}.
+  @var{pos} tells you whether there is additional text above the top
+of the window, or below the bottom.  If your buffer is small and all
+of it is visible in the window, @var{pos} is @samp{All}.  Otherwise,
+it is @samp{Top} if you are looking at the beginning of the buffer,
+@samp{Bot} if you are looking at the end of the buffer, or
+@samp{@var{nn}%}, where @var{nn} is the percentage of the buffer above
+the top of the window.  With Size Indication mode, you can display the
+size of the buffer as well.  @xref{Optional Mode Line}.
 
   @var{line} is the character @samp{L} followed by the line number at
 point.  (You can display the current column number too, by turning on
@@ -249,16 +249,14 @@ Column Number mode.  @xref{Optional Mode Line}.)
 
   @var{major} is the name of the @dfn{major mode} used in the buffer.
 A major mode is a principal editing mode for the buffer, such as Text
-mode, Lisp mode, C mode, and so forth.  @xref{Major Modes}.
-
-  Some major modes display additional information after the major mode
-name.  For example, Rmail buffers display the current message number and
-the total number of messages.  Compilation buffers and Shell buffers
-display the status of the subprocess.
+mode, Lisp mode, C mode, and so forth.  @xref{Major Modes}.  Some
+major modes display additional information after the major mode name.
+For example, Compilation buffers and Shell buffers display the status
+of the subprocess.
 
-  @var{minor} is a list of some of the @dfn{minor modes} turned on in
-the buffer.  Minor modes are optional editing modes that provide
-additional features on top of the major mode.  @xref{Minor Modes}.
+  @var{minor} is a list of some of the enabled @dfn{minor modes},
+which are optional editing modes that provide additional features on
+top of the major mode.  @xref{Minor Modes}.
 
   Some features are listed together with the minor modes whenever they
 are turned on, even though they are not really minor modes.
@@ -271,9 +269,8 @@ restricted to only a portion of its text (@pxref{Narrowing}).
 brackets (@samp{[@dots{}]}) appear around the parentheses that
 surround the modes.  If Emacs is in one recursive editing level within
 another, double square brackets appear, and so on.  Since recursive
-editing levels affect Emacs globally, not just one buffer, the square
-brackets appear in every window's mode line or not in any of them.
-@xref{Recursive Edit}.@refill
+editing levels affect Emacs globally, such square brackets appear in
+the mode line of every window.  @xref{Recursive Edit}.
 
   You can change the appearance of the mode line as well as the format
 of its contents.  @xref{Optional Mode Line}.  In addition, the mode
@@ -293,10 +290,10 @@ here, as you can more easily see them yourself.
 @findex tmm-menubar
 @findex menu-bar-open
   On a graphical display, you can use the mouse to choose a command
-from the menu bar.  A right-arrow at the end of a menu item means it
+from the menu bar.  An arrow on the right edge of a menu item means it
 leads to a subsidiary menu, or @dfn{submenu}.  A @samp{...} at the end
-of a menu item means that the command invoked will prompt you for
-further input before it actually does anything.
+of a menu item means that the command will prompt you for further
+input before it actually does anything.
 
   Some of the commands in the menu bar have ordinary key bindings as
 well; if so, a key binding is shown in parentheses after the item
@@ -310,14 +307,13 @@ You can then navigate the menus with the arrow keys.  To activate a
 selected menu item, press @key{RET}; to cancel menu navigation, press
 @key{ESC}.
 
-  On text-only terminals with no mouse, you can use the menu bar by
-typing @kbd{M-`} or @key{F10} (these run the command
-@code{tmm-menubar}).  This lets you select a menu item with the
-keyboard.  A provisional choice appears in the echo area.  You can use
-the up and down arrow keys to move through the menu to different
-items, and then you can type @key{RET} to select the item.
-
-  Each menu item also has an assigned letter or digit which designates
-that item; it is usually the initial of some word in the item's name.
-This letter or digit is separated from the item name by @samp{=>}.  You
-can type the item's letter or digit to select the item.
+  On a text-only terminal, you can use the menu bar by typing
+@kbd{M-`} or @key{F10} (these run the command @code{tmm-menubar}).
+This lets you select a menu item with the keyboard.  A provisional
+choice appears in the echo area.  You can use the up and down arrow
+keys to move through the menu to different items, and then you can
+type @key{RET} to select the item.  Each menu item is also designated
+by a letter or digit (usually the initial of some word in the item's
+name).  This letter or digit is separated from the item name by
+@samp{=>}.  You can type the item's letter or digit to select the
+item.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 0b0e4867ae5..96ccaa2b3c4 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -332,6 +332,8 @@ pages are often meaningful divisions of the file, Emacs provides
 commands to move over them and operate on them.
 
 @table @kbd
+@item M-x what-page
+Display the page number of point, and the line number within that page.
 @item C-x [
 Move point to previous page boundary (@code{backward-page}).
 @item C-x ]
@@ -342,6 +344,10 @@ Put point and mark around this page (or another page) (@code{mark-page}).
 Count the lines in this page (@code{count-lines-page}).
 @end table
 
+@findex what-page
+  @kbd{M-x what-page} counts pages from the beginning of the file, and
+counts lines within the page, showing both numbers in the echo area.
+
 @kindex C-x [
 @kindex C-x ]
 @findex forward-page
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 27c2597c6a3..f822b4bebdf 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,23 @@
+2011-10-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffers.texi (The Buffer List): Describe how bury-buffer deals
+        with the selected window.
+        * windows.texi (Buffers and Windows): Reformulate text on how
+        replace-buffer-in-windows deals with a window.
+        (Quitting Windows): Describe how quit-window deals with a
+        standalone frame.  Describe new option frame-auto-hide-function.
+
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * symbols.texi (Other Plists): Markup fix.  (Bug#9702)
+
+        * positions.texi (Excursions): Update warning message.
+
+2011-10-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * display.texi (Low-Level Font, Face Attributes, Font Lookup): Fix
+        Emacs manual xref (Bug#9675).
+
 2011-10-01  Chong Yidong  <cyd@stupidchicken.com>
 
         * windows.texi (Textual Scrolling): Document scroll-up-command,
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index ce1a8b0fb4e..816d0f9faa8 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -884,23 +884,28 @@ This buffer therefore becomes the least desirable candidate for
 @code{other-buffer} to return.  The argument can be either a buffer
 itself or the name of one.
 
-@code{bury-buffer} operates on each frame's @code{buffer-list} parameter
-as well as the fundamental buffer list; therefore, the buffer that you
-bury will come last in the value of @code{(buffer-list @var{frame})} and
-in the value of @code{(buffer-list)}.
-
-If @var{buffer-or-name} is @code{nil} or omitted, this means to bury
-the current buffer.  In addition, if the buffer is displayed in the
-selected window, this switches to some other buffer (obtained using
-@code{other-buffer}) in the selected window.  @xref{Switching
-Buffers}.  But if the selected window is dedicated to its buffer, it
-deletes that window if there are other windows left on its frame.
-Otherwise, if the selected window is the only window on its frame, it
-iconifies that frame.  If @var{buffer-or-name} is displayed in some
+This functions operates on each frame's @code{buffer-list} parameter as
+well as the fundamental buffer list; therefore, the buffer that you bury
+will come last in the value of @code{(buffer-list @var{frame})} and in
+the value of @code{(buffer-list)}.  In addition, it also puts the buffer
+at the end of the list of buffer of the selected window (@pxref{Window
+History}) provided it is shown in that window.
+
+If @var{buffer-or-name} is @code{nil} or omitted, this means to bury the
+current buffer.  In addition, if the current buffer is displayed in the
+selected window, this makes sure that the window is either deleted or
+another buffer is shown in it.  More precisely, if the window is
+dedicated (@pxref{Dedicated Windows}) and there are other windows on its
+frame, the window is deleted.  If the window is both dedicated and the
+only window on its frame's terminal, the function specified by
+@code{frame-auto-hide-function} (@pxref{Quitting Windows}) will deal
+with the window.  If the window is not dedicated to its buffer, it calls
+@code{switch-to-prev-buffer} (@pxref{Window History}) to show another
+buffer in that window.  If @var{buffer-or-name} is displayed in some
 other window, it remains displayed there.
 
 To replace a buffer in all the windows that display it, use
-@code{replace-buffer-in-windows}.  @xref{Buffers and Windows}.
+@code{replace-buffer-in-windows}, @xref{Buffers and Windows}.
 @end deffn
 
 @deffn Command unbury-buffer
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 724c46300fd..18cb93557e9 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2148,12 +2148,11 @@ When specifying this attribute using @code{set-face-attribute}
 entity, or a string.  Emacs converts such values to an appropriate
 font object, and stores that font object as the actual attribute
 value.  If you specify a string, the contents of the string should be
-a font name (@pxref{Font X,, Font Specification Options, emacs, The
-GNU Emacs Manual}); if the font name is an XLFD containing wildcards,
-Emacs chooses the first font matching those wildcards.  Specifying
-this attribute also changes the values of the @code{:family},
-@code{:foundry}, @code{:width}, @code{:height}, @code{:weight}, and
-@code{:slant} attributes.
+a font name (@pxref{Fonts,,, emacs, The GNU Emacs Manual}); if the
+font name is an XLFD containing wildcards, Emacs chooses the first
+font matching those wildcards.  Specifying this attribute also changes
+the values of the @code{:family}, @code{:foundry}, @code{:width},
+@code{:height}, @code{:weight}, and @code{:slant} attributes.
 
 @item :inherit
 The name of a face from which to inherit attributes, or a list of face
@@ -2854,11 +2853,11 @@ nominal heights and widths would suggest.
 @defun x-list-fonts name &optional reference-face frame maximum width
 This function returns a list of available font names that match
 @var{name}.  @var{name} should be a string containing a font name in
-either the Fontconfig, GTK, or XLFD format (@pxref{Font X,, Font
-Specification Options, emacs, The GNU Emacs Manual}).  Within an XLFD
-string, wildcard characters may be used: the @samp{*} character
-matches any substring, and the @samp{?} character matches any single
-character.  Case is ignored when matching font names.
+either the Fontconfig, GTK, or XLFD format (@pxref{Fonts,,, emacs, The
+GNU Emacs Manual}).  Within an XLFD string, wildcard characters may be
+used: the @samp{*} character matches any substring, and the @samp{?}
+character matches any single character.  Case is ignored when matching
+font names.
 
 If the optional arguments @var{reference-face} and @var{frame} are
 specified, the returned list includes only fonts that are the same
@@ -3108,8 +3107,7 @@ specifications are as follows:
 @table @code
 @item :name
 The font name (a string), in either XLFD, Fontconfig, or GTK format.
-@xref{Font X,, Font Specification Options, emacs, The GNU Emacs
-Manual}.
+@xref{Fonts,,, emacs, The GNU Emacs Manual}.
 
 @item :family
 @itemx :foundry
@@ -3226,10 +3224,9 @@ specified by @var{font}.
 
 @defun font-xlfd-name font &optional fold-wildcards
 This function returns the XLFD (X Logical Font Descriptor), a string,
-matching @var{font}.  @xref{Font X,, Font Specification Options,
-emacs, The GNU Emacs Manual}, for information about XLFDs.  If the
-name is too long for an XLFD (which can contain at most 255
-characters), the function returns @code{nil}.
+matching @var{font}.  @xref{Fonts,,, emacs, The GNU Emacs Manual}, for
+information about XLFDs.  If the name is too long for an XLFD (which
+can contain at most 255 characters), the function returns @code{nil}.
 
 If the optional argument @var{fold-wildcards} is non-@code{nil},
 consecutive wildcards in the XLFD are folded into one.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 1124d58ebcc..74444c7ad60 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -832,7 +832,7 @@ consequences, so the byte compiler warns if you call @code{set-buffer}
 during an excursion:
 
 @example
-Warning: @code{save-excursion} defeated by @code{set-buffer}
+Warning: Use `with-current-buffer' rather than save-excursion+set-buffer
 @end example
 
 @noindent
diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index 60d14d567d4..79b3249d760 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -541,7 +541,7 @@ returns @code{nil}.  For example,
 (plist-get '(foo 4 bad) 'foo)
      @result{} 4
 (plist-get '(foo 4 bad) 'bad)
-     @result{} @code{nil}
+     @result{} nil
 (plist-get '(foo 4 bad) 'bar)
      @result{} nil
 @end example
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index bffea19210c..41ccbaafd49 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2076,16 +2076,17 @@ This command replaces @var{buffer-or-name} with some other buffer, in
 all windows displaying it.  For each such window, it choose another
 buffer using @code{switch-to-prev-buffer} (@pxref{Window History}).
 
-@var{buffer-or-name} may be a buffer, or the name of an existing
-buffer; it defaults to the current buffer.
+The argument @var{buffer-or-name} may be a buffer, or the name of an
+existing buffer; it defaults to the current buffer.
 
 If a window displaying @var{buffer-or-name} is dedicated
-(@pxref{Dedicated Windows}), has never displayed any other buffers and
-is not the only window on its frame, that window is deleted.  If that
-window is the only window on its frame and there are other frames on the
-frame's terminal, that frame is deleted too; otherwise, the buffer
-provided by the function @code{switch-to-prev-buffer} (@pxref{Window
-History}) is displayed instead.
+(@pxref{Dedicated Windows}) and is not the only window on its frame,
+that window is deleted.  If that window is the only window on its frame
+and there are other frames on the frame's terminal, that frame is dealt
+with by the function spcecified by @code{frame-auto-hide-function}
+(@pxref{Quitting Windows}).  Otherwise, the buffer provided by the
+function @code{switch-to-prev-buffer} (@pxref{Window History}) is
+displayed in the window instead.
 @end deffn
 
 
@@ -2784,14 +2785,14 @@ non-@code{nil} value.
 @section Quitting Windows
 
 When you want to get rid of a window used for displaying a buffer you
-can use the function @code{delete-window} (@pxref{Deleting Windows}) to
-remove that window from its frame.  If the buffer has been shown on a
-separate frame, you might want to call @code{delete-frame}
-(@pxref{Deleting Frames}) instead.  If, on the other hand, a window has
-been reused for displaying the buffer, you might prefer showing the
-buffer previously shown in that window by calling the function
-@code{switch-to-prev-buffer} (@pxref{Window History}).  Finally, you
-might want to either bury (@pxref{The Buffer List}) or kill
+can call @code{delete-window} or @code{delete-windows-on}
+(@pxref{Deleting Windows}) to remove that window from its frame.  If the
+buffer is shown on a separate frame, you might want to call
+@code{delete-frame} (@pxref{Deleting Frames}) instead.  If, on the other
+hand, a window has been reused for displaying the buffer, you might
+prefer showing the buffer previously shown in that window by calling the
+function @code{switch-to-prev-buffer} (@pxref{Window History}).
+Finally, you might want to either bury (@pxref{The Buffer List}) or kill
 (@pxref{Killing Buffers}) the window's buffer.
 
    The following function uses information on how the window for
@@ -2807,9 +2808,12 @@ instead of burying it.
 Quitting @var{window} means to proceed as follows: If @var{window} was
 created specially for displaying its current buffer, delete @var{window}
 provided its frame contains at least one other live window.  If
-@var{window} is the only window on its frame and other frames still
-exist, delete the frame together with @var{window}.  If, however, there
-are no other frames left, display some other buffer in @var{window}.
+@var{window} is the only window on its frame and there are other frames
+on the frame's terminal, the value of @var{kill} determines how to
+proceed with the window.  If @var{kill} is @code{nil}, the fate of the
+frame is determined by calling @code{frame-auto-hide-function} (see
+below) with that frame as sole argument.  If @var{kill} is
+non-@code{nil}, the frame is deleted unconditionally.
 
 If @var{window} was reused for displaying its buffer, this command tries
 to display the buffer previously shown in it.  It also tries to restore
@@ -2831,6 +2835,31 @@ stored in @var{window}'s @code{quit-restore} window parameter
 (@pxref{Window Parameters}) and resets that parameter to @code{nil}
 after it's done.
 
+The following option specifies how to deal with a frame containing just
+one window that shall be either quit or whose buffer shall be buried.
+
+@defopt frame-auto-hide-function
+The function specified by this option is called to automatically hide
+frames.  This function is called with one argument - a frame.
+
+The function specified here is called by @code{bury-buffer} (@pxref{The
+Buffer List}) when the selected window is dedicated and shows the buffer
+that shall be buried.  It is also called by @code{quit-window} (see
+above) when the frame of the window that shall be quit has been
+specially created for displaying that window's buffer and the buffer
+shall be buried.
+
+The default is to call @code{iconify-frame} (@pxref{Visibility of
+Frames}).  Alternatively, you may either specify @code{delete-frame}
+(@pxref{Deleting Frames}) to remove the frame from its display,
+@code{ignore} to leave the frame unchanged, or any other function that
+can take a frame as its sole argument.
+
+Note that the function specified by this option is called if and only if
+there's at least one other frame on the terminal of the frame it's
+supposed to handle and that frame contains only one live window.
+@end defopt
+
 
 @node Window Point
 @section Windows and Point
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index a5146be9175..b9175ce51ea 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacsclient.1: Document how -a "" starts the daemon.
+
 2011-09-17  Sven Joachim  <svenjoac@gmx.de>
 
         * emacs.1: Escape a dash.
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 4020b6c0b6a..a5abcff0d5d 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -52,8 +52,8 @@ options starting with two dashes (`-').
 .B \-a, \-\-alternate-editor=EDITOR
 if the Emacs server is not running, run the specified editor instead.
 This can also be specified via the `ALTERNATE_EDITOR' environment variable.
-If the value of EDITOR is the empty string, then Emacs is started in
-daemon mode and emacsclient will try to connect to it.
+If the value of EDITOR is the empty string, run `emacs --daemon' to
+start Emacs in daemon mode, and try to connect to it.
 .TP
 .B -c, \-\-create-frame
 create a new frame instead of trying to use the current Emacs frame
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6af229bbdda..b1bc1cffec2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Fix ert rules.
+
+2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Gnus Utility Functions): Add more references and
+        explanations (bug#9683).
+
 2011-09-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Archived Messages): Note the default (bug#9552).
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 28a949f81e2..34f136b09ff 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -370,12 +370,13 @@ erc.pdf: ${srcdir}/erc.texi
         $(ENVADD) $(TEXI2PDF) $<
 
 ert : $(infodir)/ert
-$(infodir)/ert: ert.texi $(infodir)
-        cd $(srcdir); $(MAKEINFO) ert.texi
-ert.dvi: ert.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
-ert.pdf: ert.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
+$(infodir)/ert: ert.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
+ert.dvi: ${srcdir}/ert.texi
+        $(ENVADD) $(TEXI2DVI) $<
+ert.pdf: ${srcdir}/ert.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 eshell : $(infodir)/eshell
 $(infodir)/eshell: eshell.texi
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 211bfdb5509..ad1d45cca1a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -29093,7 +29093,7 @@ Takes an unprefixed group name and a select method, and returns the full
 
 @item gnus-get-info
 @findex gnus-get-info
-Returns the group info list for @var{group}.
+Returns the group info list for @var{group} (@pxref{Group Info}).
 
 @item gnus-group-unread
 @findex gnus-group-unread
@@ -29102,7 +29102,8 @@ unknown.
 
 @item gnus-active
 @findex gnus-active
-The active entry for @var{group}.
+The active entry (i.e., a cons cell containing the lowest and highest
+article numbers) for @var{group}.
 
 @item gnus-set-active
 @findex gnus-set-active
@@ -29137,7 +29138,9 @@ Returns the select method corresponding to @var{server}.
 
 @item gnus-server-equal
 @findex gnus-server-equal
-Says whether two virtual servers are equal.
+Says whether two virtual servers are essentially equal.  For instance,
+two virtual servers may have server parameters in different order, but
+this function will consider them equal.
 
 @item gnus-group-native-p
 @findex gnus-group-native-p
@@ -29153,8 +29156,9 @@ Says whether @var{group} is foreign or not.
 
 @item gnus-group-find-parameter
 @findex gnus-group-find-parameter
-Returns the parameter list of @var{group}.  If given a second parameter,
-returns the value of that parameter for @var{group}.
+Returns the parameter list of @var{group} (@pxref{Group Parameters}).
+If given a second parameter, returns the value of that parameter for
+@var{group}.
 
 @item gnus-group-set-parameter
 @findex gnus-group-set-parameter
diff --git a/etc/NEWS b/etc/NEWS
index 332d12cb540..7cda5ec09ff 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -96,27 +96,22 @@ and also when HOME is set to C:\ by default.
 
 *** shell-mode uses pcomplete rules, with the standard completion UI.
 
-*** Many packages have been changed to use completion-at-point rather than
-their own completion code.
+*** Many packages have been changed to use `completion-at-point'
+rather than their own completion code.
 
+*** `completion-at-point' now handles tags and semantic completion.
+---
 *** Completion in a non-minibuffer now tries to detect the end of completion
 and pops down the *Completions* buffer accordingly.
-
++++
 *** Completion can cycle, depending on completion-cycle-threshold.
-
++++
 *** New completion style `substring'.
 
 *** Completion style can be set per-category `completion-category-overrides'.
 
 *** Completion of buffers now uses substring completion by default.
 
-*** `completing-read' can be customized using the new variable
-`completing-read-function'.
-
-*** minibuffer-local-filename-must-match-map is not used any more.
-Instead, the bindings in minibuffer-local-filename-completion-map are combined
-with minibuffer-local-must-match-map.
-
 ** Mail changes
 
 The default of `send-mail-function' is now `sendmail-query-once',
@@ -453,9 +448,10 @@ isearch-yank-kill.
 *** M-s C-e in Isearch is now bound to isearch-yank-line.
 
 +++
-** New command `count-words-region'.  This does what you expect.
+** New commands `count-words-region' and `count-words'.
 
-** completion-at-point now handles tags and semantic completion.
+*** `count-lines-region' is now an alias for `count-words-region',
+bound to M-=, which shows the number of lines, words, and characters.
 
 ** The default value of `backup-by-copying-when-mismatch' is now t.
 
@@ -724,6 +720,8 @@ in the Rmail incoming message.
 
 ** Shell mode
 
+*** Shell mode uses pcomplete rules, with the standard completion UI.
+
 *** The `shell' command prompts for the shell path name if the default
 directory is a remote file name and neither the environment variable
 $ESHELL nor the variable `explicit-shell-file-name' is set.
@@ -1108,6 +1106,11 @@ See the docstring of `display-buffer' for details.
 The behavior of `quit-window' has been changed in order to restore the
 state before the last buffer display operation in that window.
 
++++
+*** The new option `frame-auto-hide-function' lets you choose between
+iconfying or deleting a frame when burying a buffer shown in a dedicated
+frame or quitting a window showing a buffer in a frame of its own.
+
 ** Completion
 
 *** New variable completion-extra-properties used to specify extra properties
@@ -1128,6 +1131,13 @@ can specify various details of the data returned by `all-completions':
 - `display-sort-function' to specify how to sort entries in *Completions*.
 - `cycle-sort-function' to specify how to sort entries when cycling.
 
+*** minibuffer-local-filename-must-match-map is not used any more.
+Instead, the bindings in minibuffer-local-filename-completion-map are
+combined with minibuffer-local-must-match-map.
+
+*** New variable `completing-read-function' allows overriding the
+behavior of `completing-read'.
+
 ** `glyphless-char-display' can now distinguish between graphical and
 text terminal display, via a char-table entry that is a cons cell.
 
diff --git a/leim/ChangeLog b/leim/ChangeLog
index c6ee6d7bbbd..6130bf57800 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -44,7 +44,7 @@
         * MISC-DIC/cangjie-table.b5, MISC-DIC/cangjie-table.cns,
         * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Likewise.
 
-        * Makefile.in (TIT_BIG5): Renamed from TIT-BIG5.
+        * Makefile.in (TIT_BIG5): Rename from TIT-BIG5.
 
 2011-05-30  Oliver Scholz  <epameinondas@gmx.de>
 
@@ -86,18 +86,18 @@
         POSIX does not allow "-" in Makefile variable names.
         Reported by Bruno Haible in
         <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
-        * Makefile.in (BUILT_EMACS): Renamed from BUILT-EMACS.
-        (TIT_GB): Renamed from TIT-GB.
-        (CHINESE_TIT): Renamed from CHINESE-TIT.
-        (NON_TIT_GB): Renamed from NON-TIT-GB.
-        (NON_TIT_BIG5): Renamed from NON-TIT-BIG5.
-        (CHINESE_NON_TIT): Renamed from CHINESE-NON-TIT.
-        (CHINESE_GB): Renamed from CHINESE-GB.
-        (CHINESE_BIG5): Renamed from CHINESE-BIG5.
-        (TIT_MISC): Renamed from TIT-MISC.
-        (NON_TIT_MISC): Renamed from NON-TIT-MISC.
-        (TIT_SOURCES): Renamed from TIT-SOURCES.
-        (MISC_SOURCES): Renamed from MISC-SOURCES.
+        * Makefile.in (BUILT_EMACS): Rename from BUILT-EMACS.
+        (TIT_GB): Rename from TIT-GB.
+        (CHINESE_TIT): Rename from CHINESE-TIT.
+        (NON_TIT_GB): Rename from NON-TIT-GB.
+        (NON_TIT_BIG5): Rename from NON-TIT-BIG5.
+        (CHINESE_NON_TIT): Rename from CHINESE-NON-TIT.
+        (CHINESE_GB): Rename from CHINESE-GB.
+        (CHINESE_BIG5): Rename from CHINESE-BIG5.
+        (TIT_MISC): Rename from TIT-MISC.
+        (NON_TIT_MISC): Rename from NON-TIT-MISC.
+        (TIT_SOURCES): Rename from TIT-SOURCES.
+        (MISC_SOURCES): Rename from MISC-SOURCES.
 
 2011-01-08  Glenn Morris  <rgm@gnu.org>
 
@@ -418,8 +418,8 @@
         ("thai-kesmanee", "thai-pattachote"): Don't use
         UPDATE-TRANSLATION-FUNCTION.
 
-        * quail/indian.el (quail-indian-preceding-char-position): Delete
-        function.
+        * quail/indian.el (quail-indian-preceding-char-position):
+        Delete function.
         (quail-indian-update-preceding-char): Delete variable.
         (quail-indian-update-translation): Delete function.
         (quail-define-indian-trans-package): Don't call
@@ -487,7 +487,7 @@
         ("german-alt-postfix", "icelandic-alt-postfix")
         ("norwegian-alt-postfix", "scandinavian-alt-postfix")
         ("spanish-alt-postfix", "swedish-alt-postfix"):
-        Deleted; they were identical to the non-alt versions.
+        Delete; they were identical to the non-alt versions.
 
 2007-12-07  Kenichi Handa  <handa@ni.aist.go.jp>
 
@@ -637,7 +637,7 @@
 
 2005-11-03  Andreas Schwab  <schwab@suse.de>
 
-        * Makefile.in (GZIP_PROG): Renamed from GZIP.
+        * Makefile.in (GZIP_PROG): Rename from GZIP.
         (install): Adjust.
 
 2005-11-01  Romain Francoise  <romain@orebokech.com>
@@ -1274,8 +1274,8 @@
 
 2001-04-23  Gerd Moellmann  <gerd@gnu.org>
 
-        * quail/latin-ltx.el: Add more translations.  From
-        jsbien@mimuw.edu.pl (Janusz S. Bień).
+        * quail/latin-ltx.el: Add more translations.
+        From jsbien@mimuw.edu.pl (Janusz S. Bień).
 
 2001-04-19  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -1318,8 +1318,8 @@
 
 2001-04-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * Makefile.in (KOREAN): Add ${srcdir}/quail/hanja3.elc.  From
-        Kenichi Handa <handa@etl.go.jp>.
+        * Makefile.in (KOREAN): Add ${srcdir}/quail/hanja3.elc.
+        From Kenichi Handa <handa@etl.go.jp>.
 
         * Makefile.in (.NOTPARALLEL, .NO_PARALLEL): Add ${MISC-DIC}.
 
@@ -1372,8 +1372,8 @@
 
 2001-03-16  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/japanese.el (quail-japanese-transliteration-rules): New
-        variable.  Use it to define these input methods: "japanese",
+        * quail/japanese.el (quail-japanese-transliteration-rules):
+        New variable.  Use it to define these input methods: "japanese",
         "japanese-hiragana", "japanese-katakana".
         (quail-japanese-kana-state): Delete this variable.
         (quail-japanese-toggle-kana): Don't use quail-japanese-kana-state,
@@ -1428,7 +1428,7 @@
 
 2001-01-28  Gerd Moellmann  <gerd@gnu.org>
 
-        * Makefile.in (extraclean): Added target so make doesn't die if
+        * Makefile.in (extraclean): Add target so make doesn't die if
         one runs "make extraclean" at the top level.
 
 2001-01-06  Andrew Innes  <andrewi@gnu.org>
@@ -1478,7 +1478,7 @@
         (NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN)
         (TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el
         files to .elc.
-        ($(TIT)): Adjusted for the above change.
+        ($(TIT)): Adjust for the above change.
         (clean mostlyclean): Likewise.
         (.el.elc): New target.
 
@@ -1488,7 +1488,7 @@
         (NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN)
         (TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el
         files to .elc.
-        ($(TIT)): Adjusted for the above change.
+        ($(TIT)): Adjust for the above change.
         (clean mostlyclean): Likewise.
         (.el.elc): New target.
 
@@ -1552,7 +1552,7 @@
         ("japanese-hankaku-kana", "japanese-hiragana")
         ("japanese-katakana"): Docstring modified.
 
-        * quail/czech.el ("czech-qwerty"): Changed to show keyboard layout
+        * quail/czech.el ("czech-qwerty"): Change to show keyboard layout
         on describe-input-method.
         ("czech-prog-1", "czech-prog-2", "czech-prog-3"): Likewise.
 
@@ -1660,12 +1660,12 @@
 
 1999-09-19  Ken'ichi Handa  <handa@gnu.org>
 
-        * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Renamed from
+        * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Rename from
         turkish-postfix.
         ("turkish-postfix"): New Turkish input method which inserts
         Latin-5 characters.
 
-        * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Renamed from
+        * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Rename from
         turkish-alt-postfix.
         ("turkish-alt-postfix"): New Turkish input method which inserts
         Latin-5 characters.
@@ -1715,7 +1715,7 @@
 1998-12-15  Kenichi Handa  <handa@etl.go.jp>
 
         * quail/devanagari.el (quail-devanagari-compose-characters):
-        Adjusted for the change of input method handling.
+        Adjust for the change of input method handling.
         (quail-devanagari-hindi-compose-characters): Likewise.
 
 1998-10-15  Kenichi Handa  <handa@etl.go.jp>
@@ -1747,16 +1747,16 @@
 1998-09-25  Kenichi Handa  <handa@etl.go.jp>
 
         * quail/japanese.el (quail-japanese-hankaku-update-translation):
-        Adjusted for the change of input method handling.
+        Adjust for the change of input method handling.
 
 1998-09-11  Kenichi HANDA  <handa@etl.go.jp>
 
         * quail/japanese.el (quail-japanese-katakana-update-translation):
-        Adjusted for the change of input method handling.
+        Adjust for the change of input method handling.
 
 1998-08-31  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/tibetan.el (quail-tibetan-input-wylie): Adjusted for the
+        * quail/tibetan.el (quail-tibetan-input-wylie): Adjust for the
         change of input method handling.
         (quail-tibetan-input-tibkey): Likewise.
 
@@ -1780,7 +1780,7 @@
 1998-08-06  Kenichi Handa  <handa@etl.go.jp>
 
         * quail/japanese.el (quail-japanese-use-double-n): New variable.
-        (quail-japanese-update-translation): Adjusted for the change of
+        (quail-japanese-update-translation): Adjust for the change of
         quail-update-translation.  Now this function should return
         CONTROL-FLAG.
         (quail-japanese-toggle-kana): Update quail-conversion-str.
@@ -1790,8 +1790,8 @@
 
 1998-07-24  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/japanese.el (quail-japanese-kanji-kkc): Set
-        quail-translation to nil after calling kkc-region so that
+        * quail/japanese.el (quail-japanese-kanji-kkc):
+        Set quail-translation to nil after calling kkc-region so that
         translation mode is restarted correctly.
 
 1998-07-21  Kenichi Handa  <handa@etl.go.jp>
@@ -1802,15 +1802,15 @@
 
 1998-07-19  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/japanese.el (quail-japanese-update-translation): Handle
-        a key which should fix the current translation and start a new
+        * quail/japanese.el (quail-japanese-update-translation):
+        Handle a key which should fix the current translation and start a new
         translation correctly.
-        (quail-japanese-toggle-kana): Set quail-translating to nil.  Don't
-        change point.
+        (quail-japanese-toggle-kana): Set quail-translating to nil.
+        Don't change point.
 
 1998-07-15  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/japanese.el (quail-japanese-kanji-kkc): Adjusted for the
+        * quail/japanese.el (quail-japanese-kanji-kkc): Adjust for the
         change of quail.el.
         (quail-japanese-switch-package): Likewise.
 
@@ -1895,17 +1895,17 @@
 
         * quail/symbol-ksc.el: Title string of the input method
         "korean-symbol" changed.  Require 'korea-util.
-        (quail-hangul-switch-back): Deleted.
+        (quail-hangul-switch-back): Delete.
 
         * quail/hangul3.el: Require 'korea-util.
-        (quail-hangul-switch-to-symbol-ksc): Deleted.
+        (quail-hangul-switch-to-symbol-ksc): Delete.
 
         * quail/hanja.el: Require 'korea-util.  Title string of the input
         method "korean-hanja" changed.
-        (quail-hanja-switch-to-symbol-ksc): Deleted.
+        (quail-hanja-switch-to-symbol-ksc): Delete.
 
         * quail/hangul.el: Require 'korea-util.
-        (quail-hangul-switch-to-symbol-ksc): Deleted.
+        (quail-hangul-switch-to-symbol-ksc): Delete.
 
 1997-10-23  Kenichi Handa  <handa@etl.go.jp>
 
@@ -1951,18 +1951,18 @@
 
 1997-09-10  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/ethiopic.el: Don't bind keys in quail-mode-map.  The
-        function added to quail-mode-hook turn ethio-mode on only when
+        * quail/ethiopic.el: Don't bind keys in quail-mode-map.
+        The function added to quail-mode-hook turn ethio-mode on only when
         input method "ethiopic" is begin used.
-        (ethio-prefer-ascii-space): Moved to lisp/language/ethio-util.el.
+        (ethio-prefer-ascii-space): Move to lisp/language/ethio-util.el.
         (ethio-toggle-space): Likewise.
         (ethio-insert-space): Likewise.
         (ethio-insert-ethio-space): Likewise.
         (ethio-prefer-ascii-punctuation): Likewise.
         (ethio-toggle-punctuation): Likewise.
         (ethio-gemination): Likewise.
-        ("ethiopic"): Doc-string of this Quail package modified.  Bind
-        function keys for TRANSLATION-KEYMAP to
+        ("ethiopic"): Doc-string of this Quail package modified.
+        Bind function keys for TRANSLATION-KEYMAP to
         quail-execute-non-quail-command.
 
 1997-09-10  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
@@ -1972,8 +1972,8 @@
 
 1997-09-03  Ken'ichi Handa  <handa@psilocin.gnu.ai.mit.edu>
 
-        * Makefile.in (install): Do not copy leim-list.el twice.  Copy
-        `skk' subdirectory too.
+        * Makefile.in (install): Do not copy leim-list.el twice.
+        Copy `skk' subdirectory too.
 
 1997-09-03  Kenichi Handa  <handa@etl.go.jp>
 
@@ -2028,8 +2028,8 @@
 
 1997-08-23  Kenichi Handa  <handa@etl.go.jp>
 
-        * quail/devanagari.el (quail-devanagari-compose-characters): Fix
-        previous change.
+        * quail/devanagari.el (quail-devanagari-compose-characters):
+        Fix previous change.
         (quail-devanagari-hindi-compose-characters): Fix previous change.
 
         * quail/japanese.el (quail-japanese-kkc-mode-exit): Fix previous
@@ -2054,8 +2054,8 @@
         (CHINESE-CNS): File name change: tsangchi-cns.el -> tsang-cns.el.
         (leim-list.el): Delete old files not contained in ${WORLD}.
 
-        * quail/japanese.el (quail-japanese-kkc-mode-exit): Run
-        input-method-after-insert-chunk-hook.
+        * quail/japanese.el (quail-japanese-kkc-mode-exit):
+        Run input-method-after-insert-chunk-hook.
 
         * quail/thai.el (thai-keyboard-mapping-alist): Some entry corrected.
 
@@ -2075,17 +2075,17 @@
 
         * quail/thai.el (thai-consonant-input): Typo fixed.
 
-        * quail/devanagari.el (quail-devanagari-compose-characters): Do
-        not call throw.
+        * quail/devanagari.el (quail-devanagari-compose-characters):
+        Do not call throw.
         (quail-devanagari-hindi-compose-characters): Likewise.
 
-        * quail/hangul.el (quail-hangul-switch-to-symbol-ksc): Call
-        activate-input-method instead of select-input-method.
+        * quail/hangul.el (quail-hangul-switch-to-symbol-ksc):
+        Call activate-input-method instead of select-input-method.
 
         * quail/hangul3.el (quail-hangul-switch-to-symbol-ksc): Likewise.
 
-        * quail/symbol-ksc.el (quail-hangul-switch-back): Likewise.  Use
-        input-method-history instead of previous-input-method.
+        * quail/symbol-ksc.el (quail-hangul-switch-back): Likewise.
+        Use input-method-history instead of previous-input-method.
 
 1997-08-16  Valery Alexeev  <valery@domovoy.math.uga.edu>
 
diff --git a/lib/signal.in.h b/lib/signal.in.h
index b0e192feeae..e18e0b29832 100644
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -178,6 +178,10 @@ _GL_WARN_ON_USE (raise, "raise can crash on native Windows - "
 #if @GNULIB_SIGPROCMASK@
 # if !@HAVE_POSIX_SIGNALBLOCKING@
 
+#  ifndef GNULIB_defined_signal_blocking
+#   define GNULIB_defined_signal_blocking 1
+#  endif
+
 /* Maximum signal number + 1.  */
 #  ifndef NSIG
 #   define NSIG 32
@@ -303,18 +307,10 @@ _GL_CXXALIAS_SYS (signal, _gl_function_taking_int_returning_void_t,
 # endif
 _GL_CXXALIASWARN (signal);
 
-/* Raise signal SIG.  */
 # if !@HAVE_POSIX_SIGNALBLOCKING@ && GNULIB_defined_SIGPIPE
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef raise
-#   define raise rpl_raise
-#  endif
-_GL_FUNCDECL_RPL (raise, int, (int sig));
-_GL_CXXALIAS_RPL (raise, int, (int sig));
-# else
-_GL_CXXALIAS_SYS (raise, int, (int sig));
+/* Raise signal SIGPIPE.  */
+_GL_EXTERN_C int _gl_raise_SIGPIPE (void);
 # endif
-_GL_CXXALIASWARN (raise);
 
 #elif defined GNULIB_POSIXCHECK
 # undef sigaddset
diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index 6ccac5a8343..e75c7576cdf 100644
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -330,27 +330,19 @@ rpl_signal (int sig, handler_t handler)
 }
 
 #if GNULIB_defined_SIGPIPE
-/* Raise the signal SIG.  */
+/* Raise the signal SIGPIPE.  */
 int
-rpl_raise (int sig)
-# undef raise
+_gl_raise_SIGPIPE (void)
 {
-  switch (sig)
+  if (blocked_set & (1U << SIGPIPE))
+    pending_array[SIGPIPE] = 1;
+  else
     {
-    case SIGPIPE:
-      if (blocked_set & (1U << sig))
-        pending_array[sig] = 1;
-      else
-        {
-          handler_t handler = SIGPIPE_handler;
-          if (handler == SIG_DFL)
-            exit (128 + SIGPIPE);
-          else if (handler != SIG_IGN)
-            (*handler) (sig);
-        }
-      return 0;
-    default: /* System defined signal */
-      return raise (sig);
+      handler_t handler = SIGPIPE_handler;
+      if (handler == SIG_DFL)
+        exit (128 + SIGPIPE);
+      else if (handler != SIG_IGN)
+        (*handler) (SIGPIPE);
     }
 }
 #endif
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efe1d4b4a42..103d7b25518 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,149 @@
+2011-10-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (special-display-buffer-names)
+        (special-display-regexps): Remove some remnants of earlier
+        changes from doc-strings.
+
+2011-10-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (frame-auto-hide-function): Add version tag.
+        (Bug#9699)
+
+2011-10-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-file-name-handler): Add 'debug to the error
+        condition.
+
+2011-10-09  Leo Liu  <sdl.web@gmail.com>
+
+        * mail/smtpmail.el (smtpmail-send-data): Add a missing space.
+        (Bug#9701)
+
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-calculate-indent): Give preprocessor lines
+        before the first code statement zero indent.  (Bug#9690)
+
+2011-10-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (count-words-region): Always count in the region.
+        Report the number of lines and characters too.
+        (count-words): New command, which counts in the buffer if the
+        region is inactive, as count-words-region used to.
+        (count-words--message): New function.  Handle plurals.
+        (count-lines-region): Make it an alias for count-words-region.
+
+        * bindings.el (esc-map): Replace count-lines-region with
+        count-words-region.
+
+2011-10-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--delete): Delete dedicated frame
+        unconditionally when argument KILL is non-nil.  (Bug#9699)
+        (switch-to-buffer): Fix doc-string typo.
+
+2011-10-08  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * lisp/eshell/eshell.el (eshell-command): Avoid using hooks.
+
+2011-10-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el ([M-left],[M-right]): Bind to left-word and
+        right-word respectively.
+
+2011-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * cus-start.el (debug-on-quit): Fix custom type.
+
+2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * subr.el (define-key-after): Clarify that the function is not
+        useful for non-menu keymaps.
+
+        * progmodes/gdb-mi.el (gdb): Fix typo in doc string.
+
+2011-10-06  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * eshell/eshell.el (eshell-command): Enable `eshell-mode' only
+        in current minibuffer (Fix bug with recursive minibuffers).
+
+2011-10-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/gdb-mi.el (gdb): Doc fix.
+
+2011-10-05  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (frame-auto-hide-function): New option replacing
+        frame-auto-delete.  Suggested by Stefan Monnier.
+        (window--delete): Call frame-auto-hide-function instead of
+        investigating frame-auto-delete.
+        (window-point-1, set-window-point-1): New functions.
+        (window-in-direction, record-window-buffer, window-state-get-1)
+        (display-buffer-record-window): Use window-point-1 instead of
+        window-point.
+        (set-window-buffer-start-and-point): Use set-window-point-1.
+
+2011-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/edebug.el: Heed checkdoc recommendations.
+
+2011-10-05  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/perl-mode.el (perl-electric-terminator): Doc fix.
+        (perl-calculate-indent): Suppress scan errors.  (Bug#2205)
+
+2011-10-05  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (read-char-choice): Fix argument to buffer-live-p which
+        works with buffer object.
+
+2011-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mpc.el (mpc-tool-bar-map): Add labels.
+
+2011-10-04  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/holidays.el (calendar-check-holidays): Doc fix.
+
+2011-10-04  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--delete): New function.
+        (frame-auto-delete): Resuscitate option.
+        (bury-buffer, replace-buffer-in-windows)
+        (quit-window): Rewrite using window--delete.
+        (display-buffer-pop-up-frame, display-buffer-pop-up-window):
+        Pass display-buffer-mark-dedicated to window--display-buffer-2
+        (Bug#9639).
+
+2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-unix.el (pcomplete/scp): Don't assume pcomplete-all-entries
+        returns a list (bug#9554).  Add remote file name completion.
+        * comint.el (comint--table-subvert): Curry and get quote&unquote
+        functions as arguments.
+        (comint--complete-file-name-data): Adjust call accordingly.
+        * pcomplete.el (pcomplete--table-subvert): Remove.
+        (pcomplete-completions-at-point): Use comint--table-subvert instead.
+
+        * minibuffer.el (completion-table-case-fold): Use currying.
+        (completion--styles-type, completion--cycling-threshold-type):
+        New constants.
+        (completion-styles, completion-category-overrides)
+        (completion-cycle-threshold): Use them.
+        * pcomplete.el (pcomplete-completions-at-point): Adjust call to
+        completion-table-case-fold.
+
+2011-10-03  Stephen Berman  <stephen.berman@gmx.net>
+
+        * minibuffer.el (completion-category-overrides): Fix type of styles
+        and add more user friendly tags (bug#9660).
+
+2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * international/mule-cmds.el: Fix abuses of apply-partially (bug#9661).
+        (mule-input-method-string): New widget.
+        (default-input-method, language-info-custom-alist): Use it.
+
 2011-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * pcomplete.el: Require comint.
@@ -12,8 +158,8 @@
         * pcmpl-gnu.el (pcmpl-gnu-with-file-buffer): New macro (bug#9643).
         (pcmpl-gnu-tar-buffer): Remove.
         (pcmpl-gnu-with-file-buffer): Use it to avoid leaving the tar's buffer
-        avoid.  Make sure pcomplete-suffix-list is only changed temporarily.
-        Don't look inside the tar's file is it's too large.
+        around.  Make sure pcomplete-suffix-list is only changed temporarily.
+        Don't look inside the tar's file if it's too large.
 
 2011-10-01  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 57bfeb60f82..1a10d117987 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -773,7 +773,7 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key ctl-x-map "\C-o" 'delete-blank-lines)
 (define-key esc-map " " 'just-one-space)
 (define-key esc-map "z" 'zap-to-char)
-(define-key esc-map "=" 'count-lines-region)
+(define-key esc-map "=" 'count-words-region)
 (define-key ctl-x-map "=" 'what-cursor-position)
 (define-key esc-map ":" 'eval-expression)
 ;; Define ESC ESC : like ESC : for people who type ESC ESC out of habit.
@@ -1103,9 +1103,9 @@ if `inhibit-field-text-motion' is non-nil."
   "Keymap for characters following C-c.")
 (define-key global-map "\C-c" 'mode-specific-command-prefix)
 
-(global-set-key [M-right]  'forward-word)
+(global-set-key [M-right]  'right-word)
 (define-key esc-map [right] 'forward-word)
-(global-set-key [M-left]   'backward-word)
+(global-set-key [M-left]   'left-word)
 (define-key esc-map [left] 'backward-word)
 ;; ilya@math.ohio-state.edu says these bindings are standard on PC editors.
 (global-set-key [C-right]  'right-word)
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 695f9b92712..3ba1078f62d 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -632,8 +632,9 @@ The optional LABEL is used to label the buffer created."
 ;;;###diary-autoload
 (defun calendar-check-holidays (date)
   "Check the list of holidays for any that occur on DATE.
-The value returned is a list of strings of relevant holiday descriptions.
-The holidays are those in the list `calendar-holidays'."
+DATE is a list (month day year).  This function considers the
+holidays from the list `calendar-holidays', and returns a list of
+strings describing those holidays that apply on DATE."
   (let ((displayed-month (calendar-extract-month date))
         (displayed-year (calendar-extract-year date))
         holiday-list)
diff --git a/lisp/comint.el b/lisp/comint.el
index 59feab82e44..52580db6186 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3040,8 +3040,9 @@ Returns t if successful."
     (comint--complete-file-name-data)))
 
 ;; FIXME: comint--common-suffix, comint--common-quoted-suffix, and
-;; comint--table-subvert copied from pcomplete.  And they don't fully solve
-;; the problem, since selecting a file from *Completions* won't quote it.
+;; comint--table-subvert don't fully solve the problem, since
+;; selecting a file from *Completions* won't quote it, among several
+;; other problems.
 
 (defun comint--common-suffix (s1 s2)
   (assert (not (or (string-match "\n" s1) (string-match "\n" s2))))
@@ -3076,43 +3077,45 @@ SS1 = (unquote SS2)."
       (cons (substring s1 0 (- (length s1) cs))
             (substring s2 0 (- (length s2) cs))))))
 
-(defun comint--table-subvert (table s1 s2 string pred action)
+(defun comint--table-subvert (table s1 s2 &optional quote-fun unquote-fun)
   "Completion table that replaces the prefix S1 with S2 in STRING.
 When TABLE, S1 and S2 are provided by `apply-partially', the result
 is a completion table which completes strings of the form (concat S1 S)
 in the same way as TABLE completes strings of the form (concat S2 S)."
-  (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
-                                         completion-ignore-case))
-                  (concat s2 (comint-unquote-filename
-                              (substring string (length s1))))))
-         (res (if str (complete-with-action action table str pred))))
-    (when res
-      (cond
-       ((and (eq (car-safe action) 'boundaries))
-        (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0)))
-          (list* 'boundaries
-                 (max (length s1)
-                      ;; FIXME: Adjust because of quoting/unquoting.
-                      (+ beg (- (length s1) (length s2))))
-                 (and (eq (car-safe res) 'boundaries) (cddr res)))))
-       ((stringp res)
-        (if (eq t (compare-strings res 0 (length s2) s2 nil nil
-                                   completion-ignore-case))
-            (concat s1 (comint-quote-filename
-                        (substring res (length s2))))))
-       ((eq action t)
-        (let ((bounds (completion-boundaries str table pred "")))
-          (if (>= (car bounds) (length s2))
-              res
-            (let ((re (concat "\\`"
-                              (regexp-quote (substring s2 (car bounds))))))
-              (delq nil
-                    (mapcar (lambda (c)
-                              (if (string-match re c)
-                                  (substring c (match-end 0))))
-                            res))))))
-       ;; E.g. action=nil and it's the only completion.
-       (res)))))
+  (lambda (string pred action)
+    (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
+                                           completion-ignore-case))
+                    (let ((rest (substring string (length s1))))
+                      (concat s2 (if unquote-fun
+                                     (funcall unquote-fun rest) rest)))))
+           (res (if str (complete-with-action action table str pred))))
+      (when res
+        (cond
+         ((and (eq (car-safe action) 'boundaries))
+          (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0)))
+            (list* 'boundaries
+                   (max (length s1)
+                        ;; FIXME: Adjust because of quoting/unquoting.
+                        (+ beg (- (length s1) (length s2))))
+                   (and (eq (car-safe res) 'boundaries) (cddr res)))))
+         ((stringp res)
+          (if (eq t (compare-strings res 0 (length s2) s2 nil nil
+                                     completion-ignore-case))
+              (let ((rest (substring res (length s2))))
+                (concat s1 (if quote-fun (funcall quote-fun rest) rest)))))
+         ((eq action t)
+          (let ((bounds (completion-boundaries str table pred "")))
+            (if (>= (car bounds) (length s2))
+                res
+              (let ((re (concat "\\`"
+                                (regexp-quote (substring s2 (car bounds))))))
+                (delq nil
+                      (mapcar (lambda (c)
+                                (if (string-match re c)
+                                    (substring c (match-end 0))))
+                              res))))))
+         ;; E.g. action=nil and it's the only completion.
+         (res))))))
 
 (defun comint-completion-file-name-table (string pred action)
   (if (not (file-name-absolute-p string))
@@ -3146,10 +3149,10 @@ in the same way as TABLE completes strings of the form (concat S2 S)."
          (table
           (let ((prefixes (comint--common-quoted-suffix
                            unquoted filename)))
-            (apply-partially
-             #'comint--table-subvert
+            (comint--table-subvert
              #'comint-completion-file-name-table
-             (cdr prefixes) (car prefixes)))))
+             (cdr prefixes) (car prefixes)
+             #'comint-quote-filename #'comint-unquote-filename))))
     (nconc
      (list
       filename-beg filename-end
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 232c6c3808e..3760a7a9d74 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -180,12 +180,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                              (symbol :format "%v"))
                                      (const :tag "always" t)))
              (debug-ignored-errors debug (repeat (choice symbol regexp)))
-             (debug-on-quit debug
-                            (choice (const :tag "off")
-                                    (repeat :menu-tag "When"
-                                            :value (nil)
-                                            (symbol :format "%v"))
-                                    (const :tag "always" t)))
+             (debug-on-quit debug boolean)
              ;; fileio.c
              (delete-by-moving-to-trash auto-save boolean "23.1")
              (auto-save-visited-file-name auto-save boolean)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 57d25c9e169..176b906632c 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1557,7 +1557,7 @@ expressions; a `progn' form will be returned enclosing these forms."
   ;; The first spec is handled and the remainder-handler handles the rest.
   (let ((edebug-matching-depth
          (if (> edebug-matching-depth edebug-max-depth)
-             (error "too deep - perhaps infinite loop in spec?")
+             (error "Too deep - perhaps infinite loop in spec?")
            (1+ edebug-matching-depth))))
     (cond
      ((null specs) nil)
@@ -3201,7 +3201,7 @@ before returning.  The default is one second."
   "Modify the breakpoint for the form at point or after it.
 Set it if FLAG is non-nil, clear it otherwise.  Then move to that point.
 If CONDITION or TEMPORARY are non-nil, add those attributes to
-the breakpoint.  "
+the breakpoint."
   (let ((edebug-stop-point (edebug-find-stop-point)))
     (if edebug-stop-point
         (let* ((edebug-def-name (car edebug-stop-point))
@@ -3879,24 +3879,23 @@ Global commands prefixed by `global-edebug-prefix':
 \\{global-edebug-map}
 
 Options:
-edebug-setup-hook
-edebug-all-defs
-edebug-all-forms
-edebug-save-windows
-edebug-save-displayed-buffer-points
-edebug-initial-mode
-edebug-trace
-edebug-test-coverage
-edebug-continue-kbd-macro
-edebug-print-length
-edebug-print-level
-edebug-print-circle
-edebug-on-error
-edebug-on-quit
-edebug-on-signal
-edebug-unwrap-results
-edebug-global-break-condition
-"
+`edebug-setup-hook'
+`edebug-all-defs'
+`edebug-all-forms'
+`edebug-save-windows'
+`edebug-save-displayed-buffer-points'
+`edebug-initial-mode'
+`edebug-trace'
+`edebug-test-coverage'
+`edebug-continue-kbd-macro'
+`edebug-print-length'
+`edebug-print-level'
+`edebug-print-circle'
+`edebug-on-error'
+`edebug-on-quit'
+`edebug-on-signal'
+`edebug-unwrap-results'
+`edebug-global-break-condition'"
   ;; If the user kills the buffer in which edebug is currently active,
   ;; exit to top level, because the edebug command loop can't usefully
   ;; continue running in such a case.
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 1a9d7c97b83..c33c2ccf9d1 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -344,16 +344,16 @@ With prefix ARG, insert output into the current buffer at point."
   (require 'esh-cmd)
   (unless arg
     (setq arg current-prefix-arg))
-  (unwind-protect
-      (let ((eshell-non-interactive-p t))
-        (add-hook 'minibuffer-setup-hook 'eshell-mode)
-        (add-hook 'minibuffer-exit-hook 'eshell-add-command-to-history)
-        (add-hook 'eshell-mode-hook 'eshell-return-exits-minibuffer)
-        (unless command
-          (setq command (read-from-minibuffer "Emacs shell command: "))))
-    (remove-hook 'eshell-mode-hook 'eshell-return-exits-minibuffer)
-    (remove-hook 'minibuffer-exit-hook 'eshell-add-command-to-history)
-    (remove-hook 'minibuffer-setup-hook 'eshell-mode))
+  (let ((eshell-non-interactive-p t))
+    ;; Enable `eshell-mode' only in this minibuffer.
+    (minibuffer-with-setup-hook #'(lambda ()
+                                    (eshell-mode)
+                                    (eshell-return-exits-minibuffer))
+      (unwind-protect
+           (unless command
+             (setq command (read-from-minibuffer "Emacs shell command: ")))
+        (when command
+          (eshell-add-input-to-history command)))))
   (unless command
     (error "No command specified!"))
   ;; redirection into the current buffer is achieved by adding an
diff --git a/lisp/faces.el b/lisp/faces.el
index 9a14e832065..d5f0ef90ee0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2065,9 +2065,9 @@ terminal type to a different value."
     (((supports :underline t))
      :underline t)
     (t
-     ;; default to italic, even it doesn't appear to be supported,
-     ;; because in some cases the display engine will do it's own
-     ;; workaround (to `dim' on ttys)
+     ;; Default to italic, even if it doesn't appear to be supported,
+     ;; because in some cases the display engine will do its own
+     ;; workaround (to `dim' on ttys).
      :slant italic))
   "Basic italic face."
   :group 'basic-faces)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a330d5c6be8..9c76635fb63 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,32 @@
+2011-10-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * html2text.el (html2text-get-attr): Correctly handle attribute values
+        containing "=".
+
+2011-09-22  Kan-Ru Chen  <kanru@kanru.info>
+
+        * ecomplete.el (ecomplete-display-matches): Use a local keymap to
+        handle bindings.
+
+2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-win.el (gnus-configure-windows): Protect against reading
+        ephemeral groups outside of Gnus.
+
+2011-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * shr.el (shr-tag-img): Don't get images displayed in tables.
+
+2011-10-03  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-group.el (gnus-bug-group-download-format-alist): Once again get
+        the "maintainer" version of debbugs.gnu.org reports.
+
+2011-10-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-tag-img): Add a space at the end of an ALT image text to
+        make asynchronous adjacent image insertion work better.
+
 2011-09-27  Daiki Ueno  <ueno@unixuser.org>
 
         * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index 6a47b119f10..5d1c46bc2f6 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -27,6 +27,11 @@
 (eval-when-compile
   (require 'cl))
 
+(eval-when-compile
+  (when (featurep 'xemacs)
+    ;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
+    (require 'edmacro)))
+
 (defgroup ecomplete nil
   "Electric completion of email addresses and the like."
   :group 'mail)
@@ -123,15 +128,24 @@
             (message "%s" matches)
             nil)
         (setq highlight (ecomplete-highlight-match-line matches line))
-        (while (not (memq (setq command (read-event highlight)) '(? return)))
-          (cond
-           ((eq command ?\M-n)
-            (setq line (min (1+ line) max-lines)))
-           ((eq command ?\M-p)
-            (setq line (max (1- line) 0))))
-          (setq highlight (ecomplete-highlight-match-line matches line)))
-        (when (eq command 'return)
-          (nth line (split-string matches "\n")))))))
+        (let ((local-map (make-sparse-keymap))
+              selected)
+          (define-key local-map (kbd "RET")
+            (lambda () (setq selected (nth line (split-string matches "\n")))))
+          (define-key local-map (kbd "M-n")
+            (lambda () (setq line (min (1+ line) max-lines))))
+          (define-key local-map (kbd "M-p")
+            (lambda () (setq line (max (1- line) 0))))
+          (let ((overriding-local-map local-map))
+            (while (and (null selected)
+                        (setq command (read-key-sequence highlight))
+                        (lookup-key local-map command))
+              (apply (key-binding command) nil)
+              (setq highlight (ecomplete-highlight-match-line matches line))))
+          (if selected
+              (message selected)
+            (message "Abort"))
+          selected)))))
 
 (defun ecomplete-highlight-match-line (matches line)
   (with-temp-buffer
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 720881acd98..4c527caff5c 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2429,7 +2429,7 @@ Valid input formats include:
     (gnus-read-ephemeral-gmane-group group start range)))
 
 (defcustom gnus-bug-group-download-format-alist
-  '((emacs . "http://debbugs.gnu.org/%s;mboxstat=yes")
+  '((emacs . "http://debbugs.gnu.org/%s;mboxmaint=yes;mboxstat=yes")
     (debian
      . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes"))
   "Alist of symbols for bug trackers and the corresponding URL format string.
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index c38f57d96cb..a1a8abc3086 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -358,8 +358,13 @@ See the Gnus manual for an explanation of the syntax used.")
 (defvar gnus-frame-split-p nil)
 
 (defun gnus-configure-windows (setting &optional force)
-  (if (window-configuration-p setting)
-      (set-window-configuration setting)
+  (cond
+   ((null setting)
+    ;; Do nothing.
+    )
+   ((window-configuration-p setting)
+    (set-window-configuration setting))
+   (t
     (setq gnus-current-window-configuration setting)
     (setq force (or force gnus-always-force-window-configuration))
     (let ((split (if (symbolp setting)
@@ -410,7 +415,7 @@ See the Gnus manual for an explanation of the syntax used.")
           (run-hooks 'gnus-configure-windows-hook)
           (when gnus-window-frame-focus
             (gnus-select-frame-set-input-focus
-             (window-frame gnus-window-frame-focus))))))))
+             (window-frame gnus-window-frame-focus)))))))))
 
 (defun gnus-delete-windows-in-gnusey-frames ()
   "Do a `delete-other-windows' in all frames that have Gnus windows."
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 0635ab0afc6..7e699827141 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -193,7 +193,7 @@ formatting, and then moved afterward.")
      ;; size=3
      ((string-match "[^ ]=[^ ]" prev)
       (let ((attr  (nth 0 (split-string prev "=")))
-            (value (nth 1 (split-string prev "="))))
+            (value (substring prev (1+ (string-match "=" prev)))))
         (setq attr-list (cons (list attr value) attr-list))))
      ;; size= 3
      ((string-match "[^ ]=\\'" prev)
@@ -204,7 +204,7 @@ formatting, and then moved afterward.")
        ;; size=3
        ((string-match "[^ ]=[^ ]" this)
         (let ((attr  (nth 0 (split-string this "=")))
-              (value (nth 1 (split-string this "="))))
+              (value (substring prev (1+ (string-match "=" this)))))
           (setq attr-list (cons (list attr value) attr-list))))
        ;; size =3
        ((string-match "\\`=[^ ]" this)
@@ -358,7 +358,7 @@ formatting, and then moved afterward.")
     (delete-region p1 p4)
     (when href
       (goto-char p1)
-      (insert (substring href 1 -1 ))
+      (insert (substring href 1 -1))
       (put-text-property p1 (point) 'face 'bold))))
 
 ;;
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f49bbd69da3..7b9af3302af 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -901,7 +901,7 @@ ones, in case fg and bg are nil."
                (url-is-cached (shr-encode-url url)))
           (funcall shr-put-image-function (shr-get-image-data url) alt))
          (t
-          (insert alt)
+          (insert alt " ")
           (when (and shr-ignore-cache
                      (url-is-cached (shr-encode-url url)))
             (let ((file (url-cache-create-filename (shr-encode-url url))))
@@ -912,14 +912,15 @@ ones, in case fg and bg are nil."
                'url-queue-retrieve
              'url-retrieve)
            (shr-encode-url url) 'shr-image-fetched
-           (list (current-buffer) start (point-marker))
+           (list (current-buffer) start (set-marker (make-marker) (1- (point))))
            t)))
-        (put-text-property start (point) 'keymap shr-map)
-        (put-text-property start (point) 'shr-alt alt)
-        (put-text-property start (point) 'image-url url)
-        (put-text-property start (point) 'image-displayer
-                           (shr-image-displayer shr-content-function))
-        (put-text-property start (point) 'help-echo alt)
+        (when (zerop shr-table-depth) ;; We are not in a table.
+          (put-text-property start (point) 'keymap shr-map)
+          (put-text-property start (point) 'shr-alt alt)
+          (put-text-property start (point) 'image-url url)
+          (put-text-property start (point) 'image-displayer
+                             (shr-image-displayer shr-content-function))
+          (put-text-property start (point) 'help-echo alt))
         (setq shr-state 'image)))))
 
 (defun shr-tag-pre (cont)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 3276447e72f..0a5d6ed954c 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1306,17 +1306,22 @@ If nil, that means no input method is activated now.")
 (make-variable-buffer-local 'current-input-method-title)
 (put 'current-input-method-title 'permanent-local t)
 
+(define-widget 'mule-input-method-string 'string
+  "String widget with completion for input method."
+  :completions
+  (lambda (string pred action)
+    (let ((completion-ignore-case t))
+      (complete-with-action action input-method-alist string pred)))
+  :prompt-history 'input-method-history)
+
 (defcustom default-input-method nil
   "Default input method for multilingual text (a string).
 This is the input method activated automatically by the command
 `toggle-input-method' (\\[toggle-input-method])."
   :link  '(custom-manual "(emacs)Input Methods")
   :group 'mule
-  :type '(choice (const nil)
-          (string
-           :completions (apply-partially
-                         #'completion-table-case-fold input-method-alist)
-           :prompt-history input-method-history))
+  :type `(choice (const nil)
+                 mule-input-method-string)
   :set-after '(current-language-environment))
 
 (put 'input-method-function 'permanent-local t)
@@ -1879,10 +1884,11 @@ specifies the character set for the major languages of Western Europe."
 (define-widget 'charset 'symbol
   "An Emacs charset."
   :tag "Charset"
-  :completions (apply-partially #'completion-table-with-predicate
-                                (apply-partially #'completion-table-case-fold
-                                                 obarray)
-                                #'charsetp 'strict)
+  :completions
+  (lambda (string pred action)
+    (let ((completion-ignore-case t))
+      (completion-table-with-predicate
+       obarray #'charsetp 'strict string pred action)))
   :value 'ascii
   :validate (lambda (widget)
               (unless (charsetp (widget-value widget))
@@ -1917,8 +1923,10 @@ See `set-language-info-alist' for use in programs."
   :type `(alist
           :key-type (string :tag "Language environment"
                             :completions
-                            (apply-partially #'completion-table-case-fold
-                                             language-info-alist))
+                            (lambda (string pred action)
+                              (let ((completion-ignore-case t))
+                                (complete-with-action
+                                 action language-info-alist string pred))))
           :value-type
           (alist :key-type symbol
                  :options ((documentation string)
@@ -1929,12 +1937,7 @@ See `set-language-info-alist' for use in programs."
                            (coding-system (repeat coding-system))
                            (coding-priority (repeat coding-system))
                            (nonascii-translation charset)
-                           (input-method
-                            (string
-                             :completions
-                             (apply-partially #'completion-table-case-fold
-                                              input-method-alist)
-                             :prompt-history input-method-history))
+                           (input-method mule-input-method-string)
                            (features (repeat symbol))
                            (unibyte-display coding-system)))))
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index edcc82011af..026b03e350f 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -924,7 +924,7 @@ The list is in preference order.")
 (defun smtpmail-send-data (process buffer)
   (let ((data-continue t) sending-data
         (pr (with-current-buffer buffer
-              (make-progress-reporter "Sending email"
+              (make-progress-reporter "Sending email "
                                       (point-min) (point-max)))))
     (with-current-buffer buffer
       (goto-char (point-min)))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 021e46d5053..e2ed07f1ef1 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -216,9 +216,13 @@ You should give VAR a non-nil `risky-local-variable' property."
           (setq ,var (,fun)))
         ,var))))
 
-(defun completion-table-case-fold (table string pred action)
-  (let ((completion-ignore-case t))
-    (complete-with-action action table string pred)))
+(defun completion-table-case-fold (table &optional dont-fold)
+  "Return new completion TABLE that is case insensitive.
+If DONT-FOLD is non-nil, return a completion table that is
+case sensitive instead."
+  (lambda (string pred action)
+    (let ((completion-ignore-case (not dont-fold)))
+      (complete-with-action action table string pred))))
 
 (defun completion-table-with-context (prefix table string pred action)
   ;; TODO: add `suffix' maybe?
@@ -468,6 +472,15 @@ ALL-COMPLETIONS is the function that lists the completions (it should
 follow the calling convention of `completion-all-completions'),
 and DOC describes the way this style of completion works.")
 
+(defconst completion--styles-type
+  `(repeat :tag "insert a new menu to add more styles"
+           (choice ,@(mapcar (lambda (x) (list 'const (car x)))
+                             completion-styles-alist))))
+(defconst completion--cycling-threshold-type
+  '(choice (const :tag "No cycling" nil)
+           (const :tag "Always cycle" t)
+           (integer :tag "Threshold")))
+
 (defcustom completion-styles
   ;; First, use `basic' because prefix completion has been the standard
   ;; for "ever" and works well in most cases, so using it first
@@ -486,8 +499,7 @@ The available styles are listed in `completion-styles-alist'.
 
 Note that `completion-category-overrides' may override these
 styles for specific categories, such as files, buffers, etc."
-  :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
-                                   completion-styles-alist)))
+  :type completion--styles-type
   :group 'minibuffer
   :version "23.1")
 
@@ -498,18 +510,19 @@ Each override has the shape (CATEGORY . ALIST) where ALIST is
 an association list that can specify properties such as:
 - `styles': the list of `completion-styles' to use for that category.
 - `cycle': the `completion-cycle-threshold' to use for that category."
-  :type `(alist :key-type (choice (const buffer)
+  :type `(alist :key-type (choice :tag "Category"
+                                  (const buffer)
                                   (const file)
+                                  (const unicode-name)
                                   symbol)
           :value-type
-          (set
-           (cons (const style)
-                 (repeat ,@(mapcar (lambda (x) (list 'const (car x)))
-                                   completion-styles-alist)))
-           (cons (const cycle)
-                 (choice (const :tag "No cycling" nil)
-                         (const :tag "Always cycle" t)
-                         (integer :tag "Threshold"))))))
+          (set :tag "Properties to override"
+           (cons :tag "Completion Styles"
+                 (const :tag "Select a style from the menu;" styles)
+                 ,completion--styles-type)
+           (cons :tag "Completion Cycling"
+                 (const :tag "Select one value from the menu." cycle)
+                 ,completion--cycling-threshold-type))))
 
 (defun completion--styles (metadata)
   (let* ((cat (completion-metadata-get metadata 'category))
@@ -595,9 +608,7 @@ If nil, cycling is never used.
 If t, cycling is always used.
 If an integer, cycling is used as soon as there are fewer completion
 candidates than this number."
-  :type '(choice (const :tag "No cycling" nil)
-          (const :tag "Always cycle" t)
-          (integer :tag "Threshold")))
+  :type completion--cycling-threshold-type)
 
 (defun completion--cycle-threshold (metadata)
   (let* ((cat (completion-metadata-get metadata 'category))
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 8854d4e908f..251e1864927 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1089,10 +1089,12 @@ If PLAYLIST is t or nil or missing, use the main playlist."
 (defvar mpc-tool-bar-map
   (let ((map (make-sparse-keymap)))
     (tool-bar-local-item "mpc/prev" 'mpc-prev 'prev map
-     :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")))
+     :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
+     :label "Prev" :vert-only t)
     ;; FIXME: how can we bind it to the down-event?
     (tool-bar-local-item "mpc/rewind" 'mpc-rewind 'rewind map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
+     :label "Rew" :vert-only t
      :button '(:toggle . (and mpc--faster-toggle-timer
                              (not mpc--faster-toggle-forward))))
     ;; We could use a single toggle command for pause/play, with 2 different
@@ -1100,20 +1102,26 @@ If PLAYLIST is t or nil or missing, use the main playlist."
     ;; to be a toggle-button, thus displayed depressed in one of the
     ;; two states :-(
     (tool-bar-local-item "mpc/pause" 'mpc-pause 'pause map
+     :label "Pause" :vert-only t
      :visible '(equal (cdr (assq 'state mpc-status)) "play")
      :help "Pause/play")
     (tool-bar-local-item "mpc/play" 'mpc-play 'play map
+     :label "Play" :vert-only t
      :visible '(not (equal (cdr (assq 'state mpc-status)) "play"))
      :help "Play/pause")
     ;; FIXME: how can we bind it to the down-event?
     (tool-bar-local-item "mpc/ffwd" 'mpc-ffwd 'ffwd map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
+     :label "Ffwd" :vert-only t
      :button '(:toggle . (and mpc--faster-toggle-timer
                              mpc--faster-toggle-forward)))
     (tool-bar-local-item "mpc/next" 'mpc-next 'next map
+     :label "Next" :vert-only t
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")))
-    (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map)
+    (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map
+     :label "Stop" :vert-only t)
     (tool-bar-local-item "mpc/add" 'mpc-playlist-add 'add map
+     :label "Add" :vert-only t
      :help "Append to the playlist")
     map))
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1381d33efa2..7ace2911501 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1886,7 +1886,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
                       (apply foreign operation args))
 
                   ;; Trace that somebody has interrupted the operation.
-                  (quit
+                  ((debug quit)
                    (let (tramp-message-show-message)
                      (tramp-message
                       v 1 "Interrupt received in operation %s"
@@ -1898,6 +1898,9 @@ Falls back to normal file name handler if no Tramp file name handler exists."
                   ;; operations shall return at least a default value
                   ;; in order to give the user a chance to correct the
                   ;; file name in the minibuffer.
+                  ;; We cannot use 'debug as error handler.  In order
+                  ;; to get a full backtrace, one could apply
+                  ;;   (setq debug-on-error t debug-on-signal t)
                   (error
                    (cond
                     ((and completion (zerop (length localname))
@@ -3850,9 +3853,9 @@ Only works for Bourne-like shells."
 ;; * Run emerge on two remote files.  Bug is described here:
 ;;   <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>.
 ;;   (Bug#6850)
-
-;; Functions for file-name-handler-alist:
-;; diff-latest-backup-file -- in diff.el
+;; * It would be very useful if it were possible to load or save a
+;;   buffer using Tramp in a non-blocking way so that use of Emacs on
+;;   other buffers could continue.  (Bug#9617)
 
 ;;; tramp.el ends here
 
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index e947bfe1da6..b466c2cd899 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -193,10 +193,25 @@ Uses both `pcmpl-ssh-config-file' and `pcmpl-ssh-known-hosts-file'."
   "Completion rules for the `scp' command.
 Includes files as well as host names followed by a colon."
   (pcomplete-opt "1246BCpqrvcFiloPS")
-  (while t (pcomplete-here (append (pcomplete-all-entries)
-                                   (mapcar (lambda (host)
-                                             (concat host ":"))
-                                           (pcmpl-ssh-hosts))))))
+  (while t (pcomplete-here
+            (lambda (string pred action)
+              (let ((table
+                     (cond
+                      ((string-match "\\`[^:/]+:" string) ; Remote file name.
+                       (if (and (eq action 'lambda)
+                                (eq (match-end 0) (length string)))
+                           ;; Avoid connecting to the remote host when we're
+                           ;; only completing the host name.
+                           (list string)
+                         (comint--table-subvert (pcomplete-all-entries)
+                                                "" "/ssh:")))
+                      ((string-match "/" string) ; Local file name.
+                       (pcomplete-all-entries))
+                      (t                ;Host name or local file name.
+                       (append (all-completions string (pcomplete-all-entries))
+                               (mapcar (lambda (host) (concat host ":"))
+                                       (pcmpl-ssh-hosts)))))))
+                (complete-with-action action table string pred))))))
 
 (provide 'pcmpl-unix)
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 4ac69df8e3a..8ae1e203849 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -370,7 +370,7 @@ modified to be an empty string, or the desired separation string."
 ;; it pretty much impossible to have completion other than
 ;; prefix-completion.
 ;;
-;; pcomplete--common-quoted-suffix and pcomplete--table-subvert try to
+;; pcomplete--common-quoted-suffix and comint--table-subvert try to
 ;; work around this difficulty with heuristics, but it's
 ;; really a hack.
 
@@ -408,45 +408,6 @@ SS1 = (unquote SS2)."
       (cons (substring s1 0 (- (length s1) cs))
             (substring s2 0 (- (length s2) cs))))))
 
-(defun pcomplete--table-subvert (table s1 s2 string pred action)
-  ;; FIXME: Copied in comint.el.
-  "Completion table that replaces the prefix S1 with S2 in STRING.
-When TABLE, S1 and S2 are provided by `apply-partially', the result
-is a completion table which completes strings of the form (concat S1 S)
-in the same way as TABLE completes strings of the form (concat S2 S)."
-  (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
-                                         completion-ignore-case))
-                  (concat s2 (pcomplete-unquote-argument
-                              (substring string (length s1))))))
-         (res (if str (complete-with-action action table str pred))))
-    (when res
-      (cond
-       ((and (eq (car-safe action) 'boundaries))
-        (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0)))
-          (list* 'boundaries
-                 (max (length s1)
-                      ;; FIXME: Adjust because of quoting/unquoting.
-                      (+ beg (- (length s1) (length s2))))
-                 (and (eq (car-safe res) 'boundaries) (cddr res)))))
-       ((stringp res)
-        (if (eq t (compare-strings res 0 (length s2) s2 nil nil
-                                   completion-ignore-case))
-            (concat s1 (pcomplete-quote-argument
-                        (substring res (length s2))))))
-       ((eq action t)
-        (let ((bounds (completion-boundaries str table pred "")))
-          (if (>= (car bounds) (length s2))
-              res
-            (let ((re (concat "\\`"
-                              (regexp-quote (substring s2 (car bounds))))))
-              (delq nil
-                    (mapcar (lambda (c)
-                              (if (string-match re c)
-                                  (substring c (match-end 0))))
-                            res))))))
-       ;; E.g. action=nil and it's the only completion.
-       (res)))))
-
 ;; I don't think such commands are usable before first setting up buffer-local
 ;; variables to parse args, so there's no point autoloading it.
 ;; ;;;###autoload
@@ -480,7 +441,7 @@ Same as `pcomplete' but using the standard completion UI."
            ;; pcomplete-stub and works from the buffer's text instead,
            ;; we need to trick minibuffer-complete, into using
            ;; pcomplete-stub without its knowledge.  To that end, we
-           ;; use pcomplete--table-subvert to construct a completion
+           ;; use comint--table-subvert to construct a completion
            ;; table which expects strings using a prefix from the
            ;; buffer's text but internally uses the corresponding
            ;; prefix from pcomplete-stub.
@@ -498,9 +459,9 @@ Same as `pcomplete' but using the standard completion UI."
                  ;; practice it should work just fine (fingers crossed).
                  (let ((prefixes (pcomplete--common-quoted-suffix
                                   pcomplete-stub buftext)))
-                   (apply-partially #'pcomplete--table-subvert
-                                    completions
-                                    (cdr prefixes) (car prefixes))))
+                   (comint--table-subvert
+                    completions (cdr prefixes) (car prefixes)
+                    #'pcomplete-quote-argument #'pcomplete-unquote-argument)))
                 (t
                  (lambda (string pred action)
                    (let ((res (complete-with-action
@@ -523,8 +484,7 @@ Same as `pcomplete' but using the standard completion UI."
                            (funcall norm-func (directory-file-name f))
                            seen)))))))
           (when pcomplete-ignore-case
-            (setq table
-                  (apply-partially #'completion-table-case-fold table)))
+            (setq table (completion-table-case-fold table)))
           (list beg (point) table
                 :predicate pred
                 :exit-function
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index eb33822ce55..3d5c8a97835 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1489,14 +1489,19 @@ Does not check type and subprogram indentation."
       (if (not (f90-previous-statement))
           ;; If f90-previous-statement returns nil, we must have been
           ;; called from on or before the first line of the first statement.
-          (setq icol (if (save-excursion
-                           ;; f90-previous-statement has moved us over
-                           ;; comment/blank lines, so we need to get
-                           ;; back to the first code statement.
-                           (when (looking-at "[ \t]*\\([!#]\\|$\\)")
-                             (f90-next-statement))
-                           (skip-chars-forward " \t0-9")
-                           (f90-looking-at-program-block-start))
+          (setq icol (if (or (save-excursion
+                               (goto-char pnt)
+                               (beginning-of-line)
+                               ;; Preprocessor line before code statement.
+                               (looking-at "[ \t]*#"))
+                             (progn
+                               ;; f90-previous-statement has moved us over
+                               ;; comment/blank lines, so we need to get
+                               ;; back to the first code statement.
+                               (when (looking-at "[ \t]*\\([!#]\\|$\\)")
+                                 (f90-next-statement))
+                               (skip-chars-forward " \t0-9")
+                               (f90-looking-at-program-block-start)))
                          0
                        ;; No explicit PROGRAM start statement.
                        f90-program-indent))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index a4d7cff4127..22db7b2e5f4 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -605,6 +605,12 @@ NOARG must be t when this macro is used outside `gud-def'"
 The directory containing FILE becomes the initial working directory
 and source-file directory for your debugger.
 
+COMMAND-LINE is the shell command for starting the gdb session.
+It should be a string consisting of the name of the gdb
+executable followed by command-line options.  The command-line
+options should include \"-i=mi\" to use gdb's MI text interface.
+Note that the old \"--annotate\" option is no longer supported.
+
 If `gdb-many-windows' is nil (the default value) then gdb just
 pops up the GUD buffer unless `gdb-show-main' is t.  In this case
 it starts with two windows: one displaying the GUD buffer and the
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 933f004bb5d..f051b49fe2a 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -633,8 +633,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'."
 
 (defalias 'electric-perl-terminator 'perl-electric-terminator)
 (defun perl-electric-terminator (arg)
-  "Insert character and adjust indentation.
-If at end-of-line, and not in a comment or a quote, correct the's indentation."
+  "Insert character and maybe adjust indentation.
+If at end-of-line, and not in a comment or a quote, correct the indentation."
   (interactive "P")
   (let ((insertpos (point)))
     (and (not arg)                      ; decide whether to indent
@@ -832,7 +832,11 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
                   (save-excursion
                     (beginning-of-line)
                     (looking-at "\\s-+sub\\>"))
-                  (> indent-point (save-excursion (forward-sexp 1) (point))))
+                  (> indent-point (save-excursion
+                                    (condition-case nil
+                                        (forward-sexp 1)
+                                      (scan-error nil))
+                                    (point))))
         (perl-beginning-of-function))
       (while (< (point) indent-point)   ;repeat until right sexp
         (setq state (parse-partial-sexp (point) indent-point 0))
diff --git a/lisp/simple.el b/lisp/simple.el
index c81385680bf..af6d855d9c0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -945,28 +945,46 @@ rather than line counts."
       (forward-line (1- line)))))
 
 (defun count-words-region (start end)
-  "Count the number of words in the active region.
-If the region is not active, counts the number of words in the buffer."
-  (interactive (if (use-region-p) (list (region-beginning) (region-end))
-                 (list (point-min) (point-max))))
-  (let ((count 0))
+  "Return the number of words between START and END.
+If called interactively, print a message reporting the number of
+lines, words, and characters in the region."
+  (interactive "r")
+  (let ((words 0))
     (save-excursion
       (save-restriction
         (narrow-to-region start end)
         (goto-char (point-min))
         (while (forward-word 1)
-          (setq count (1+ count)))))
+          (setq words (1+ words)))))
     (when (called-interactively-p 'interactive)
-      (message "%s has %d words"
-               (if (use-region-p) "Region" "Buffer")
-               count))
-    count))
-
-(defun count-lines-region (start end)
-  "Print number of lines and characters in the region."
-  (interactive "r")
-  (message "Region has %d lines, %d characters"
-           (count-lines start end) (- end start)))
+      (count-words--message "Region"
+                            (count-lines start end)
+                            words
+                            (- end start)))
+    words))
+
+(defun count-words ()
+  "Display the number of lines, words, and characters in the buffer.
+In Transient Mark mode when the mark is active, display the
+number of lines, words, and characters in the region."
+  (interactive)
+  (if (use-region-p)
+      (call-interactively 'count-words-region)
+    (let* ((beg (point-min))
+           (end (point-max))
+           (lines (count-lines beg end))
+           (words (count-words-region beg end))
+           (chars (- end beg)))
+      (count-words--message "Buffer" lines words chars))))
+
+(defun count-words--message (str lines words chars)
+  (message "%s has %d line%s, %d word%s, and %d character%s."
+           str
+           lines (if (= lines 1) "" "s")
+           words (if (= words 1) "" "s")
+           chars (if (= chars 1) "" "s")))
+
+(defalias 'count-lines-region 'count-words-region)
 
 (defun what-line ()
   "Print the current buffer line number and narrowed line number of point."
diff --git a/lisp/subr.el b/lisp/subr.el
index 4946f3eef7a..05ac198dd13 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -552,7 +552,8 @@ AFTER should be a single event type--a symbol or a character, not a sequence.
 
 Bindings are always added before any inherited map.
 
-The order of bindings in a keymap matters when it is used as a menu."
+The order of bindings in a keymap only matters when it is used as
+a menu, so this function is not useful for non-menu keymaps."
   (unless after (setq after t))
   (or (keymapp keymap)
       (signal 'wrong-type-argument (list 'keymapp keymap)))
@@ -2170,7 +2171,7 @@ keyboard-quit events while waiting for a valid input."
             (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
           (setq char (let ((inhibit-quit inhibit-keyboard-quit))
                        (read-key prompt)))
-          (and show-help (buffer-live-p helpbuf)
+          (and show-help (buffer-live-p (get-buffer helpbuf))
                (kill-buffer helpbuf))
           (cond
            ((not (numberp char)))
diff --git a/lisp/window.el b/lisp/window.el
index c6722a62c74..7241e148dae 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1058,6 +1058,32 @@ windows nor the buffer list."
     (dolist (walk-windows-window (window-list-1 nil minibuf all-frames))
       (funcall proc walk-windows-window))))
 
+(defun window-point-1 (&optional window)
+  "Return value of WINDOW's point.
+WINDOW can be any live window and defaults to the selected one.
+
+This function is like `window-point' with one exception: If
+WINDOW is selected, it returns the value of `point' of WINDOW's
+buffer regardless of whether that buffer is current or not."
+  (setq window (window-normalize-live-window window))
+  (if (eq window (selected-window))
+      (with-current-buffer (window-buffer window)
+        (point))
+    (window-point window)))
+
+(defun set-window-point-1 (window pos)
+  "Set value of WINDOW's point to POS.
+WINDOW can be any live window and defaults to the selected one.
+
+This function is like `set-window-point' with one exception: If
+WINDOW is selected, it moves `point' of WINDOW's buffer to POS
+regardless of whether that buffer is current or not."
+  (setq window (window-normalize-live-window window))
+  (if (eq window (selected-window))
+      (with-current-buffer (window-buffer window)
+        (goto-char pos))
+    (set-window-point window pos)))
+
 (defun window-in-direction-2 (window posn &optional horizontal)
   "Support function for `window-in-direction'."
   (if horizontal
@@ -1087,7 +1113,7 @@ IGNORE, when non-nil means a window can be returned even if its
          (last (+ first (if hor
                             (window-total-width window)
                           (window-total-height window))))
-         (posn-cons (nth 6 (posn-at-point (window-point window) window)))
+         (posn-cons (nth 6 (posn-at-point (window-point-1 window) window)))
          ;; The column / row value of `posn-at-point' can be nil for the
          ;; mini-window, guard against that.
          (posn (if hor
@@ -2492,7 +2518,7 @@ WINDOW must be a live window and defaults to the selected one."
       ;; Add an entry for buffer to WINDOW's previous buffers.
       (with-current-buffer buffer
         (let ((start (window-start window))
-              (point (window-point window)))
+              (point (window-point-1 window)))
           (setq entry
                 (cons buffer
                       (if entry
@@ -2534,10 +2560,7 @@ before was current this also makes BUFFER the current buffer."
       ;; Don't force window-start here (even if POINT is nil).
       (set-window-start window start t))
     (when point
-      (if selected
-          (with-current-buffer buffer
-            (goto-char point))
-        (set-window-point window point)))))
+      (set-window-point-1 window point))))
 
 (defun switch-to-prev-buffer (&optional window bury-or-kill)
   "In WINDOW switch to previous buffer.
@@ -2738,6 +2761,44 @@ the buffer `*scratch*', creating it if necessary."
         (set-buffer-major-mode scratch)
         scratch)))
 
+(defcustom frame-auto-hide-function #'iconify-frame
+  "Function called to automatically hide frames.
+The function is called with one argument - a frame.
+
+Functions affected by this option are those that bury a buffer
+shown in a separate frame like `quit-window' and `bury-buffer'."
+  :type '(choice (const :tag "Iconify" iconify-frame)
+                 (const :tag "Delete" delete-frame)
+                 (const :tag "Do nothing" ignore)
+                 function)
+  :group 'windows
+  :group 'frames
+  :version "24.1")
+
+(defun window--delete (&optional window dedicated-only kill)
+  "Delete WINDOW if possible.
+WINDOW must be a live window and defaults to the selected one.
+Optional argument DEDICATED-ONLY non-nil means to delete WINDOW
+only if it's dedicated to its buffer.  Optional argument KILL
+means the buffer shown in window will be killed.  Return non-nil
+if WINDOW gets deleted or its frame is auto-hidden."
+  (setq window (window-normalize-live-window window))
+  (unless (and dedicated-only (not (window-dedicated-p window)))
+    (let* ((buffer (window-buffer window))
+           (deletable (window-deletable-p window)))
+      (cond
+       ((eq deletable 'frame)
+        (let ((frame (window-frame window)))
+          (cond
+           (kill
+            (delete-frame frame))
+           ((functionp frame-auto-hide-function)
+            (funcall frame-auto-hide-function frame))))
+        'frame)
+       (deletable
+        (delete-window window)
+        t)))))
+
 (defun bury-buffer (&optional buffer-or-name)
   "Put BUFFER-OR-NAME at the end of the list of all buffers.
 There it is the least likely candidate for `other-buffer' to
@@ -2758,14 +2819,11 @@ displayed there."
     ;; is shown in the selected window.
     (cond
      ((or buffer-or-name (not (eq buffer (window-buffer)))))
-     ((not (window-dedicated-p))
-      (switch-to-prev-buffer nil 'bury))
-     ((and (frame-root-window-p (selected-window))
-           ;; Don't iconify if it's the only frame.
-           (not (eq (next-frame nil 0) (selected-frame))))
-      (iconify-frame (window-frame (selected-window))))
-     ((eq (window-deletable-p) t)
-      (delete-window)))
+     ((window--delete nil t))
+     (t
+      ;; Switch to another buffer in window.
+      (set-window-dedicated-p nil nil)
+      (switch-to-prev-buffer nil 'kill)))
 
     ;; Always return nil.
     nil))
@@ -2840,30 +2898,21 @@ frames left."
 BUFFER-OR-NAME may be a buffer or the name of an existing buffer
 and defaults to the current buffer.
 
-When a window showing BUFFER-OR-NAME is either dedicated, or the
-window has no previous buffer, that window is deleted.  If that
-window is the only window on its frame, the frame is deleted too
-when there are other frames left.  If there are no other frames
-left, some other buffer is displayed in that window.
+When a window showing BUFFER-OR-NAME is dedicated, that window is
+deleted.  If that window is the only window on its frame, the
+frame is deleted too when there are other frames left.  If there
+are no other frames left, some other buffer is displayed in that
+window.
 
 This function removes the buffer denoted by BUFFER-OR-NAME from
 all window-local buffer lists."
   (let ((buffer (window-normalize-buffer buffer-or-name)))
     (dolist (window (window-list-1 nil nil t))
       (if (eq (window-buffer window) buffer)
-          (let ((deletable (and (window-dedicated-p window)
-                                (window-deletable-p window))))
-            (cond
-             ((eq deletable 'frame)
-              ;; Delete frame.
-              (delete-frame (window-frame window)))
-             (deletable
-              ;; Delete window.
-              (delete-window window))
-             (t
-              ;; Switch to another buffer in window.
-              (set-window-dedicated-p window nil)
-              (switch-to-prev-buffer window 'kill))))
+          (unless (window--delete window t t)
+            ;; Switch to another buffer in window.
+            (set-window-dedicated-p window nil)
+            (switch-to-prev-buffer window 'kill))
         ;; Unrecord BUFFER in WINDOW.
         (unrecord-window-buffer window buffer)))))
 
@@ -2893,20 +2942,10 @@ one.  If non-nil, reset `quit-restore' parameter to nil."
          quad resize)
     (cond
      ((and (not prev-buffer)
-           (eq (nth 1 quit-restore) 'frame)
-           (eq (window-deletable-p window) 'frame)
-           (eq (nth 3 quit-restore) buffer))
-      ;; WINDOW's frame can be deleted.
-      (delete-frame (window-frame window))
-      ;; If the previously selected window is still alive, select it.
-      (when (window-live-p (nth 2 quit-restore))
-        (select-window (nth 2 quit-restore))))
-     ((and (not prev-buffer)
-           (eq (nth 1 quit-restore) 'window)
-           (eq (window-deletable-p window) t)
-           (eq (nth 3 quit-restore) buffer))
-      ;; WINDOW can be deleted.
-      (delete-window window)
+           (memq (nth 1 quit-restore) '(window frame))
+           (eq (nth 3 quit-restore) buffer)
+           ;; Delete WINDOW if possible.
+           (window--delete window nil kill))
       ;; If the previously selected window is still alive, select it.
       (when (window-live-p (nth 2 quit-restore))
         (select-window (nth 2 quit-restore))))
@@ -3538,7 +3577,7 @@ specific buffers."
              ;; All buffer related things go in here - make the buffer
              ;; current when retrieving `point' and `mark'.
              (with-current-buffer (window-buffer window)
-               (let ((point (if selected (point) (window-point window)))
+               (let ((point (window-point-1 window))
                      (start (window-start window))
                      (mark (mark)))
                  (window-list-no-nils
@@ -3833,14 +3872,7 @@ element is BUFFER."
        (list 'other
              ;; A quadruple of WINDOW's buffer, start, point and height.
              (list (window-buffer window) (window-start window)
-                   (if (eq window (selected-window))
-                       ;; When WINDOW is the selected window use its
-                       ;; buffer's `point' instead of `window-point'
-                       ;; (Bug#9626).
-                       (with-current-buffer (window-buffer window)
-                         (point))
-                     (window-point window))
-                   (window-total-size window))
+                   (window-point-1 window) (window-total-size window))
              (selected-window) buffer))))
    ((eq type 'window)
     ;; WINDOW has been created on an existing frame.
@@ -3927,12 +3959,10 @@ Finally, an element of this list can be also specified as
 \(BUFFER-NAME FUNCTION OTHER-ARGS).  In that case,
 `special-display-popup-frame' will call FUNCTION with the buffer
 named BUFFER-NAME as first argument, and OTHER-ARGS as the
-second.  If `special-display-function' specifies some other
-function, that function is called with the buffer named
-BUFFER-NAME as first, and the element's cdr as second argument.
-In any case, that function is responsible for setting the value
-The function specified here is responsible for setting the
-quit-restore and help-setup parameters of the window used.
+second.
+
+Any alternative function specified here is responsible for
+setting up the quit-restore parameter of the window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -3997,10 +4027,10 @@ as second argument.
 Finally, an element of this list can be also specified as
 \(REGEXP FUNCTION OTHER-ARGS).  `special-display-popup-frame'
 will then call FUNCTION with the buffer whose name matched
-REGEXP as first, and OTHER-ARGS as second argument.  If
-`special-display-function' specifies some other function, that
-function is called with the buffer whose name matched REGEXP
-as first, and the element's cdr as second argument.
+REGEXP as first, and OTHER-ARGS as second argument.
+
+Any alternative function specified here is responsible for
+setting up the quit-restore parameter of the window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -4748,7 +4778,7 @@ return the window used; otherwise return nil."
                (setq frame (funcall fun))
                (setq window (frame-selected-window frame)))
       (display-buffer-record-window 'frame window buffer)
-      (window--display-buffer-2 buffer window)
+      (window--display-buffer-2 buffer window display-buffer-mark-dedicated)
       ;; Reset list of WINDOW's previous buffers to nil.
       (set-window-prev-buffers window nil)
       window)))
@@ -4774,7 +4804,7 @@ If sucessful, return the new window; otherwise return nil."
                                 (window--try-to-split-window
                                  (get-lru-window frame t)))))
       (display-buffer-record-window 'window window buffer)
-      (window--display-buffer-2 buffer window)
+      (window--display-buffer-2 buffer window display-buffer-mark-dedicated)
       ;; Reset list of WINDOW's previous buffers to nil.
       (set-window-prev-buffers window nil)
       window)))
@@ -4946,7 +4976,7 @@ one.
 If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed
 in the selected window; signal an error if that is
 impossible (e.g. if the selected window is minibuffer-only).  If
-non-nil, BUFFER-OR-NAME may be displayed in another window.
+nil, BUFFER-OR-NAME may be displayed in another window.
 
 Return the buffer switched to."
   (interactive
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4
index 04234bb6ef3..03cedf70af8 100644
--- a/m4/gl-comp.m4
+++ b/m4/gl-comp.m4
@@ -79,9 +79,9 @@ AC_DEFUN([gl_EARLY],
   # Code from module stdarg:
   dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
   dnl for the builtin va_copy to work.  With Autoconf 2.60 or later,
-  dnl AC_PROG_CC_STDC arranges for this.  With older Autoconf AC_PROG_CC_STDC
+  dnl gl_PROG_CC_C99 arranges for this.  With older Autoconf gl_PROG_CC_C99
   dnl shouldn't hurt, though installers are on their own to set c99 mode.
-  AC_REQUIRE([AC_PROG_CC_STDC])
+  gl_PROG_CC_C99
   # Code from module stdbool:
   # Code from module stddef:
   # Code from module stdint:
@@ -246,12 +246,6 @@ if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
 fi
 gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
       gl_gnulib_enabled_sigprocmask=true
-      if $condition; then
-        func_gl_gnulib_m4code_raise
-      fi
-      if $condition; then
-        func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616
-      fi
     fi
   }
   func_gl_gnulib_m4code_stat ()
@@ -264,13 +258,10 @@ if test $REPLACE_STAT = 1; then
 fi
 gl_SYS_STAT_MODULE_INDICATOR([stat])
       gl_gnulib_enabled_stat=true
-      if $condition; then
+      if test $REPLACE_STAT = 1; then
         func_gl_gnulib_m4code_dosname
       fi
-      if $condition; then
-        func_gl_gnulib_m4code_pathmax
-      fi
-      if $condition; then
+      if test $REPLACE_STAT = 1; then
         func_gl_gnulib_m4code_verify
       fi
     fi
@@ -305,12 +296,6 @@ gl_STDLIB_MODULE_INDICATOR([strtoull])
       gl_gnulib_enabled_verify=true
     fi
   }
-  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
-    func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616
-  fi
-  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
-    func_gl_gnulib_m4code_676220fa4366efa9bdbfccf11a857c07
-  fi
   if test $REPLACE_GETOPT = 1; then
     func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36
   fi
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 8fc448fdc8f..7d832999591 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 30
+# gnulib-common.m4 serial 31
 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -211,6 +211,29 @@ m4_ifndef([AS_VAR_IF],
 [m4_define([AS_VAR_IF],
 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
 
+# gl_PROG_CC_C99
+# Modifies the value of the shell variable CC in an attempt to make $CC
+# understand ISO C99 source code.
+# This is like AC_PROG_CC_C99, except that
+# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
+# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
+#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
+#   but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
+#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
+# Remaining problems:
+# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
+#   to CC twice
+#   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
+# - AC_PROG_CC_STDC is likely to change when C1X is an ISO standard.
+AC_DEFUN([gl_PROG_CC_C99],
+[
+  dnl Change that version number to the minimum Autoconf version that supports
+  dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
+  m4_version_prereq([9.0],
+    [AC_REQUIRE([AC_PROG_CC_C99])],
+    [AC_REQUIRE([AC_PROG_CC_STDC])])
+])
+
 # gl_PROG_AR_RANLIB
 # Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
 # The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
diff --git a/src/ChangeLog b/src/ChangeLog
index bc9ffc8f3fe..9cef045c029 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,41 @@
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * callint.c (Fcall_interactively): Give a more explicit error for the
+        'c' case with a non-character input.  (Bug#8479)
+
+2011-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (hscroll_window_tree): Support hscroll in right-to-left
+        lines.
+        (set_cursor_from_row): Fix cursor positioning in mixed L2R+R2L
+        lines that are hscrolled on the left.
+
+        * dispnew.c (buffer_posn_from_coords): Account for a possible
+        presence of header-line.  (Bug#4426)
+
+2011-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (syms_of_buffer) <enable-multibyte-characters>: Don't
+        advertise functionality which we discourage or doesn't work.
+
+2011-10-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * alloc.c (GC_LISP_OBJECT_ALIGNMENT): Use offsetof, not __alignof__
+        or sizeof.  __alignof__ gives the wrong answer on Fedora x86-64
+        with GCC 4.6.1 when configured with CC='gcc -m32' --with-wide-int;
+        this makes Emacs dump core during garbage collection on rare
+        occasions.  sizeof is obviously inferior to offsetof here, so
+        stick with offsetof.
+        (GC_POINTER_ALIGNMENT): New macro.
+        (mark_memory): Omit 3rd (offset) arg; caller changed.
+        Don't assume EMACS_INT alignment is the same as pointer alignment.
+
+2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (read_key_sequence_remapped): New var.
+        (read_key_sequence): Compute remapping in the right buffer.
+        (command_loop_1): Use read_key_sequence's remapping directly.
+
 2011-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * dired.c (file_name_completion): Don't expand file name.
@@ -124,8 +162,8 @@
 
 2011-09-24  Eli Zaretskii  <eliz@gnu.org>
 
-        * dispnew.c (syms_of_display) <redisplay-dont-pause>: Default
-        value is now t.  Doc fix.
+        * dispnew.c (syms_of_display) <redisplay-dont-pause>:
+        Default value is now t.  Doc fix.
 
         * indent.c (Fvertical_motion): Compute and apply the overshoot
         logic when moving up, not only when moving down.  Fix the
@@ -141,8 +179,8 @@
 
         * dbusbind.c (Fdbus_register_signal): Add match rule to
         Vdbus_registered_objects_table.  (Bug#9581)
-        (Fdbus_register_method, Vdbus_registered_objects_table): Fix
-        docstring.
+        (Fdbus_register_method, Vdbus_registered_objects_table):
+        Fix docstring.
 
 2011-09-24  Jim Meyering  <meyering@redhat.com>
 
@@ -622,15 +660,15 @@
         * term.c (tty_append_glyph): New function.
         (produce_stretch_glyph): Static function and its prototype deleted.
 
-        * dispextern.h (produce_stretch_glyph, tty_append_glyph): Add
-        prototypes.
+        * dispextern.h (produce_stretch_glyph, tty_append_glyph):
+        Add prototypes.
 
 2011-08-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         * image.c (parse_image_spec): Check for nonnegative, not for positive,
         when checking :margin (Bug#9390).
         (IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR):
-        Renamed from IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
+        Rename from IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
         so that the name doesn't mislead.  All uses changed.
 
 2011-08-28  Johan Bockgård  <bojohan@gnu.org>
@@ -832,8 +870,8 @@
         (read_char_minibuf_menu_prompt, follow_key, read_key_sequence):
         Use ptrdiff_t, not int, to count maps.
         (read_char_minibuf_menu_prompt): Check for overflow in size
-        calculations.  Don't update size until allocation succeeds.  Redo
-        calculations to avoid overflow.
+        calculations.  Don't update size until allocation succeeds.
+        Redo calculations to avoid overflow.
         * keyboard.h: Change prototypes to match the above.
 
         * keymap.c (cmm_size, current_minor_maps): Use ptrdiff_t, not int,
@@ -1002,7 +1040,7 @@
         * indent.c (MULTIBYTE_BYTES_WIDTH):
         Use sanitize_char_width to avoid undefined and/or bad behavior
         with outlandish widths.
-        * character.h (sanitize_tab_width): Renamed from sanitize_width,
+        * character.h (sanitize_tab_width): Rename from sanitize_width,
         now that we have two such functions.  All uses changed.
         (sanitize_char_width): New inline function.
 
@@ -1068,8 +1106,8 @@
         (png_load, gif_load, svg_load_image):
         Prefer int to unsigned where either will do.
         (tiff_handler): New function, combining the cores of the
-        old tiff_error_handler and tiff_warning_handler.  This
-        function is rewritten to use vsnprintf and thereby avoid
+        old tiff_error_handler and tiff_warning_handler.
+        This function is rewritten to use vsnprintf and thereby avoid
         stack buffer overflows.  It uses only the features of vsnprintf
         that are common to both POSIX and native Microsoft.
         (tiff_error_handler, tiff_warning_handler): Use it.
@@ -1098,8 +1136,8 @@
         `(space ...)', and specifies display in the text area, return 2
         rather than 1.
         (try_cursor_movement): Check for the need to scroll more
-        accurately, and prefer exact match for point under bidi.  Don't
-        advance `row' beyond the last row of the window.
+        accurately, and prefer exact match for point under bidi.
+        Don't advance `row' beyond the last row of the window.
 
         * dispextern.h (struct bidi_it): Rename the disp_prop_p member
         into disp_prop; all users changed.
diff --git a/src/alloc.c b/src/alloc.c
index ead5c8a8ca4..09ef4b085df 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -393,7 +393,7 @@ static int live_symbol_p (struct mem_node *, void *);
 static int live_float_p (struct mem_node *, void *);
 static int live_misc_p (struct mem_node *, void *);
 static void mark_maybe_object (Lisp_Object);
-static void mark_memory (void *, void *, int);
+static void mark_memory (void *, void *);
 static void mem_init (void);
 static struct mem_node *mem_insert (void *, void *, enum mem_type);
 static void mem_insert_fixup (struct mem_node *);
@@ -4235,14 +4235,25 @@ mark_maybe_pointer (void *p)
 }
 
 
+/* Alignment of Lisp_Object and pointer values.  Use offsetof, as it
+   sometimes returns a smaller alignment than GCC's __alignof__ and
+   mark_memory might miss objects if __alignof__ were used.  For
+   example, on x86 with WIDE_EMACS_INT, __alignof__ (Lisp_Object) is 8
+   but GC_LISP_OBJECT_ALIGNMENT should be 4.  */
+#ifndef GC_LISP_OBJECT_ALIGNMENT
+# define GC_LISP_OBJECT_ALIGNMENT offsetof (struct {char a; Lisp_Object b;}, b)
+#endif
+#define GC_POINTER_ALIGNMENT offsetof (struct {char a; void *b;}, b)
+
 /* Mark Lisp objects referenced from the address range START+OFFSET..END
    or END+OFFSET..START. */
 
 static void
-mark_memory (void *start, void *end, int offset)
+mark_memory (void *start, void *end)
 {
   Lisp_Object *p;
   void **pp;
+  int i;
 
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
   nzombies = 0;
@@ -4258,8 +4269,9 @@ mark_memory (void *start, void *end, int offset)
     }
 
   /* Mark Lisp_Objects.  */
-  for (p = (Lisp_Object *) ((char *) start + offset); (void *) p < end; ++p)
-    mark_maybe_object (*p);
+  for (p = start; (void *) p < end; p++)
+    for (i = 0; i < sizeof *p; i += GC_LISP_OBJECT_ALIGNMENT)
+      mark_maybe_object (*(Lisp_Object *) ((char *) p + i));
 
   /* Mark Lisp data pointed to.  This is necessary because, in some
      situations, the C compiler optimizes Lisp objects away, so that
@@ -4279,8 +4291,9 @@ mark_memory (void *start, void *end, int offset)
      away.  The only reference to the life string is through the
      pointer `s'.  */
 
-  for (pp = (void **) ((char *) start + offset); (void *) pp < end; ++pp)
-    mark_maybe_pointer (*pp);
+  for (pp = start; (void *) pp < end; pp++)
+    for (i = 0; i < sizeof *pp; i += GC_POINTER_ALIGNMENT)
+      mark_maybe_pointer (*(void **) ((char *) pp + i));
 }
 
 /* setjmp will work with GCC unless NON_SAVING_SETJMP is defined in
@@ -4454,15 +4467,11 @@ dump_zombies (void)
    pass starting at the start of the stack + 2.  Likewise, if the
    minimal alignment of Lisp_Objects on the stack is 1, four passes
    would be necessary, each one starting with one byte more offset
-   from the stack start.
-
-   The current code assumes by default that Lisp_Objects are aligned
-   equally on the stack.  */
+   from the stack start.  */
 
 static void
 mark_stack (void)
 {
-  int i;
   void *end;
 
 #ifdef HAVE___BUILTIN_UNWIND_INIT
@@ -4520,15 +4529,8 @@ mark_stack (void)
   /* This assumes that the stack is a contiguous region in memory.  If
      that's not the case, something has to be done here to iterate
      over the stack segments.  */
-#ifndef GC_LISP_OBJECT_ALIGNMENT
-#ifdef __GNUC__
-#define GC_LISP_OBJECT_ALIGNMENT __alignof__ (Lisp_Object)
-#else
-#define GC_LISP_OBJECT_ALIGNMENT sizeof (Lisp_Object)
-#endif
-#endif
-  for (i = 0; i < sizeof (Lisp_Object); i += GC_LISP_OBJECT_ALIGNMENT)
-    mark_memory (stack_base, end, i);
+  mark_memory (stack_base, end);
+
   /* Allow for marking a secondary stack, like the register stack on the
      ia64.  */
 #ifdef GC_MARK_SECONDARY_STACK
diff --git a/src/buffer.c b/src/buffer.c
index f38c9a739a6..fdf006a41eb 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5448,9 +5448,7 @@ file I/O and the behavior of various editing commands.
 
 This variable is buffer-local but you cannot set it directly;
 use the function `set-buffer-multibyte' to change a buffer's representation.
-Changing its default value with `setq-default' is supported.
-See also variable `default-enable-multibyte-characters' and Info node
-`(elisp)Text Representations'.  */);
+See also Info node `(elisp)Text Representations'.  */);
   XSYMBOL (intern_c_string ("enable-multibyte-characters"))->constant = 1;
 
   DEFVAR_PER_BUFFER ("buffer-file-coding-system",
diff --git a/src/callint.c b/src/callint.c
index 5cf99495671..61ab4a3963e 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -535,6 +535,8 @@ invoke it.  If KEYS is omitted or nil, the return value of
           message1_nolog ((char *) 0);
           /* Passing args[i] directly stimulates compiler bug */
           teml = args[i];
+          /* See bug#8479.  */
+          if (! CHARACTERP (teml)) error ("Non-character input-event");
           visargs[i] = Fchar_to_string (teml);
           break;
 
diff --git a/src/dispnew.c b/src/dispnew.c
index ccb24c8ceea..879ff88ff14 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5274,6 +5274,10 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
   CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp)));
   BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp)));
   start_display (&it, w, startp);
+  /* start_display takes into account the header-line row, but IT's
+     vpos still counts from the glyph row that includes the window's
+     start position.  Adjust for a possible header-line row.  */
+  it.vpos += WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
 
   x0 = *x;
 
diff --git a/src/keyboard.c b/src/keyboard.c
index b266da07a42..a21008b9502 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -252,6 +252,7 @@ static Lisp_Object Qtimer_event_handler;
 /* read_key_sequence stores here the command definition of the
    key sequence that it reads.  */
 static Lisp_Object read_key_sequence_cmd;
+static Lisp_Object read_key_sequence_remapped;
 
 static Lisp_Object Qinput_method_function;
 
@@ -1517,14 +1518,10 @@ command_loop_1 (void)
          reset it before we execute the command. */
       Vdeactivate_mark = Qnil;
 
-      /* Remap command through active keymaps */
+      /* Remap command through active keymaps.  */
       Vthis_original_command = cmd;
-      if (SYMBOLP (cmd))
-        {
-          Lisp_Object cmd1;
-          if (cmd1 = Fcommand_remapping (cmd, Qnil, Qnil), !NILP (cmd1))
-            cmd = cmd1;
-        }
+      if (!NILP (read_key_sequence_remapped))
+        cmd = read_key_sequence_remapped;
 
       /* Execute the command.  */
 
@@ -10015,6 +10012,13 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
     read_key_sequence_cmd = (first_binding < nmaps
                              ? defs[first_binding]
                              : Qnil);
+  read_key_sequence_remapped
+    /* Remap command through active keymaps.
+       Do the remapping here, before the unbind_to so it uses the keymaps
+       of the appropriate buffer.  */
+    = SYMBOLP (read_key_sequence_cmd)
+    ? Fcommand_remapping (read_key_sequence_cmd, Qnil, Qnil)
+    : Qnil;
 
   unread_switch_frame = delayed_switch_frame;
   unbind_to (count, Qnil);
@@ -11683,6 +11687,8 @@ syms_of_keyboard (void)
 
   read_key_sequence_cmd = Qnil;
   staticpro (&read_key_sequence_cmd);
+  read_key_sequence_remapped = Qnil;
+  staticpro (&read_key_sequence_remapped);
 
   menu_bar_one_keymap_changed_items = Qnil;
   staticpro (&menu_bar_one_keymap_changed_items);
diff --git a/src/xdisp.c b/src/xdisp.c
index 9e26360394c..9ec7463c555 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12119,6 +12119,7 @@ hscroll_window_tree (Lisp_Object window)
             = (desired_cursor_row->enabled_p
                ? desired_cursor_row
                : current_cursor_row);
+          int row_r2l_p = cursor_row->reversed_p;
 
           text_area_width = window_box_width (w, TEXT_AREA);
 
@@ -12126,11 +12127,31 @@ hscroll_window_tree (Lisp_Object window)
           h_margin = hscroll_margin * WINDOW_FRAME_COLUMN_WIDTH (w);
 
           if (!NILP (Fbuffer_local_value (Qauto_hscroll_mode, w->buffer))
-              && ((XFASTINT (w->hscroll)
-                   && w->cursor.x <= h_margin)
-                  || (cursor_row->enabled_p
-                      && cursor_row->truncated_on_right_p
-                      && (w->cursor.x >= text_area_width - h_margin))))
+              /* For left-to-right rows, hscroll when cursor is either
+                 (i) inside the right hscroll margin, or (ii) if it is
+                 inside the left margin and the window is already
+                 hscrolled. */
+              && ((!row_r2l_p
+                   && ((XFASTINT (w->hscroll)
+                        && w->cursor.x <= h_margin)
+                       || (cursor_row->enabled_p
+                           && cursor_row->truncated_on_right_p
+                           && (w->cursor.x >= text_area_width - h_margin))))
+                  /* For right-to-left rows, the logic is similar,
+                     except that rules for scrolling to left and right
+                     are reversed.  E.g., if cursor.x <= h_margin, we
+                     need to hscroll "to the right" unconditionally,
+                     and that will scroll the screen to the left so as
+                     to reveal the next portion of the row.  */
+                  || (row_r2l_p
+                      && ((cursor_row->enabled_p
+                           /* FIXME: It is confusing to set the
+                              truncated_on_right_p flag when R2L rows
+                              are actually truncated on the left. */
+                           && cursor_row->truncated_on_right_p
+                           && w->cursor.x <= h_margin)
+                          || (XFASTINT (w->hscroll)
+                              && (w->cursor.x >= text_area_width - h_margin))))))
             {
               struct it it;
               int hscroll;
@@ -12165,7 +12186,9 @@ hscroll_window_tree (Lisp_Object window)
                                       ? (text_area_width - 4 * FRAME_COLUMN_WIDTH (it.f))
                                       : (text_area_width / 2))))
                           / FRAME_COLUMN_WIDTH (it.f);
-              else if (w->cursor.x >= text_area_width - h_margin)
+              else if ((!row_r2l_p
+                        && w->cursor.x >= text_area_width - h_margin)
+                       || (row_r2l_p && w->cursor.x <= h_margin))
                 {
                   if (hscroll_relative_p)
                     wanted_x = text_area_width * (1 - hscroll_step_rel)
@@ -13928,7 +13951,11 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                                ? glyph_after > glyphs_end
                                : glyph_after < glyphs_end)))))
         {
-          cursor = glyph_after;
+          if (!match_with_avoid_cursor
+              && row->truncated_on_left_p && pt_old < bpos_min)
+            cursor = glyph_before;
+          else
+            cursor = glyph_after;
           x = -1;
         }
       else if (string_seen)