Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

18 files changed, 120 insertions, 101 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 451e422ae5a..4a907576774 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,25 @@
+2012-06-11  Chong Yidong  <cyd@gnu.org>
+
+	* emacs.texi: Remove urlcolor setting.
+
+2012-06-10  Chong Yidong  <cyd@gnu.org>
+
+	* emacs.texi: Update ISBN and edition number.
+
+	* anti.texi:
+	* building.texi:
+	* cmdargs.texi:
+	* custom.texi:
+	* display.texi:
+	* files.texi:
+	* frames.texi:
+	* glossary.texi:
+	* misc.texi:
+	* mule.texi:
+	* programs.texi:
+	* sending.texi:
+	* text.texi: Copyedits to avoid underfull/overfull in 7x9 manual.
+
 2012-06-06  Michael Albinus  <michael.albinus@gmx.de>
 
 	* custom.texi (Directory Variables): Mention enable-remote-dir-locals.
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index 4b40ba7357a..62433a5b220 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -63,19 +63,18 @@ string (@code{isearch-yank-line}), whereas @kbd{M-y} does
 @kbd{C-y} and @kbd{M-y} is unintended.
 
 @item
-Various completion features have been simplified.  The options
-@code{completion-cycle-threshold} and
-@code{completion-category-overrides} have been removed.  Due to the
-latter removal, Emacs uses a single consistent scheme to generate
-completions, instead of using a separate scheme for (say) buffer name
-completion.  Several major modes, such as Shell mode, now implement
-their own inline completion commands instead of using
-@code{completion-at-point}.
+Various completion features have been simplified.  The option
+@code{completion-category-overrides} has been removed, so Emacs uses a
+single consistent scheme to generate completions, instead of using a
+separate scheme for (say) buffer name completion.  Several major
+modes, such as Shell mode, now implement their own inline completion
+commands instead of using @code{completion-at-point}.
 
 @item
-We have removed various options for controlling how windows are used,
-e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist},
-@code{window-combination-limit}, and @code{window-combination-resize}.
+We have removed several options for controlling how windows are used,
+such as @code{display-buffer-base-action},
+@code{display-buffer-alist}, @code{window-combination-limit}, and
+@code{window-combination-resize}.
 
 @item
 The command @kbd{M-x customize-themes} has been removed.  Emacs no
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 0fa75cba9b4..01e6e67b07e 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -426,11 +426,11 @@ syntax checking tool used depends on the language; for example, for
 C/C++ files this is usually the C compiler.  Flymake can also use
 build tools such as @code{make} for checking complicated projects.
 
-  To enable Flymake mode, type @kbd{M-x flymake-mode}.  You can jump to
-the errors that it finds by using @kbd{M-x
-flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.
-Use the command @kbd{M-x flymake-display-err-menu-for-current-line}
-to display any error messages associated with the current line.
+  To enable Flymake mode, type @kbd{M-x flymake-mode}.  You can jump
+to the errors that it finds by using @kbd{M-x flymake-goto-next-error}
+and @kbd{M-x flymake-goto-prev-error}.  To display any error messages
+associated with the current line, type @kbd{M-x
+flymake-display-err-menu-for-current-line}.
 
   For more details about using Flymake,
 @ifnottex
@@ -1495,7 +1495,7 @@ eval-buffer} is similar but evaluates the entire buffer.
 @vindex eval-expression-print-level
 @vindex eval-expression-print-length
 @vindex eval-expression-debug-on-error
-  The customizable variables @code{eval-expression-print-level} and
+  The options @code{eval-expression-print-level} and
 @code{eval-expression-print-length} control the maximum depth and
 length of lists to print in the result of the evaluation commands
 before abbreviating them.  @code{eval-expression-debug-on-error}
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 912f979baca..fdf1c65fcd6 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -245,10 +245,10 @@ Scroll calendar one month forward (@code{calendar-scroll-left}).
 Scroll calendar one month backward (@code{calendar-scroll-right}).
 @item C-v
 @itemx @key{next}
-Scroll three months forward (@code{calendar-scroll-left-three-months}).
+Scroll forward by three months (@code{calendar-scroll-left-three-months}).
 @item M-v
 @itemx @key{prior}
-Scroll three months backward (@code{calendar-scroll-right-three-months}).
+Scroll backward by three months (@code{calendar-scroll-right-three-months}).
 @end table
 
 @kindex > @r{(Calendar mode)}
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index e6959ebd30b..2dea1577c04 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -436,7 +436,7 @@ Used by the @code{cd} command to search for the directory you specify,
 when you specify a relative directory name.
 @item EMACSDATA
 Directory for the architecture-independent files that come with Emacs.
-This is used to initialize the Lisp variable @code{data-directory}.
+This is used to initialize the variable @code{data-directory}.
 @item EMACSDOC
 Directory for the documentation string file, which is used to
 initialize the Lisp variable @code{doc-directory}.
@@ -577,7 +577,8 @@ does not use @env{TZ} at all.
 The user's login name.  See also @env{LOGNAME}.  On MS-DOS, this
 defaults to @samp{root}.
 @item VERSION_CONTROL
-Used to initialize the @code{version-control} variable (@pxref{Backup Names}).
+Used to initialize the @code{version-control} variable (@pxref{Backup
+Names}).
 @end table
 
 @node Misc Variables
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index f5657a65001..e46ffe4a186 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -765,16 +765,14 @@ displays something like this:
 @example
 fill-column is a variable defined in `C source code'.
 fill-column's value is 70
-Local in buffer custom.texi; global value is 70
-Automatically becomes buffer-local when set in any fashion.
 
-  Automatically becomes buffer-local when set in any fashion.
-  This variable is safe as a file local variable if its value
-  satisfies the predicate `integerp'.
+Automatically becomes buffer-local when set in any fashion.
+This variable is safe as a file local variable if its value
+satisfies the predicate `integerp'.
 
 Documentation:
-*Column beyond which automatic line-wrapping should happen.
-Interactively, you can set the buffer local value using C-x f.
+Column beyond which automatic line-wrapping should happen.
+Interactively, you can set the local value with C-x f.
 
 You can customize this variable.
 @end example
@@ -1054,13 +1052,14 @@ pair with a colon and semicolon.  The special variable/value pair
 @findex add-file-local-variable-prop-line
 @findex delete-file-local-variable-prop-line
 @findex copy-dir-locals-to-file-locals-prop-line
-  You can use the command @kbd{M-x add-file-local-variable-prop-line}
-instead of adding entries by hand.  It prompts for
-a variable and value, and adds them to the first line in the
-appropriate way.  @kbd{M-x delete-file-local-variable-prop-line}
-prompts for a variable, and deletes its entry from the line.  @kbd{M-x
-copy-dir-locals-to-file-locals-prop-line} copies directory-local
-variables to the first line (@pxref{Directory Variables}).
+  You can use @kbd{M-x add-file-local-variable-prop-line} instead of
+adding entries by hand.  This command prompts for a variable and
+value, and adds them to the first line in the appropriate way.
+@kbd{M-x delete-file-local-variable-prop-line} prompts for a variable,
+and deletes its entry from the line.  The command @kbd{M-x
+copy-dir-locals-to-file-locals-prop-line} copies the current
+directory-local variables to the first line (@pxref{Directory
+Variables}).
 
   Here is an example first line that specifies Lisp mode and sets two
 variables with numeric values:
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 3042fc4b2f6..2fa71127298 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -759,11 +759,10 @@ argument disables it.
 
 @findex global-font-lock-mode
 @vindex global-font-lock-mode
-  To toggle Font Lock mode in all buffers, type @kbd{M-x
-global-font-lock-mode}.  To impose this setting for future Emacs
-sessions, customize the variable @code{global-font-lock-mode}
-(@pxref{Easy Customization}), or add the following line to your init
-file:
+  Type @kbd{M-x global-font-lock-mode} to toggle Font Lock mode in all
+buffers.  To impose this setting for future Emacs sessions, customize
+the variable @code{global-font-lock-mode} (@pxref{Easy
+Customization}), or add the following line to your init file:
 
 @example
 (global-font-lock-mode 0)
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 87a550064e4..73c4adf0977 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -14,7 +14,7 @@
 @c be something added by the FSF during the publishing process.
 @c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
 @c so the format is not even consistent.
-@set EDITION   Sixteenth
+@set EDITION   Seventeenth
 @include emacsver.texi
 
 @copying
@@ -54,7 +54,7 @@ developing GNU and promoting software freedom.''
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  The manual should go
 @c onto the distribution in the full, 8.5 x 11" size.
-@c @smallbook
+@c @set smallbook
 
 @ifset smallbook
 @smallbook
@@ -66,8 +66,6 @@ developing GNU and promoting software freedom.''
 @tex
 @ifset smallbook
 @fonttextsize 10
-\global\let\urlcolor=\Black % don't print links in grayscale
-\global\let\linkcolor=\Black
 @end ifset
 \global\hbadness=6666 % don't worry about not-too-underfull boxes
 @end tex
@@ -96,10 +94,10 @@ developing GNU and promoting software freedom.''
 Published by the Free Software Foundation @*
 51 Franklin Street, Fifth Floor @*
 Boston, MA 02110-1301 USA @*
-ISBN 1-882114-86-8
+ISBN 978-0-9831592-2-3
 
 @sp 2
-Cover art by Etienne Suvasa.
+Cover art by Etienne Suvasa; cover design by Matt Lee.
 
 @end titlepage
 
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index cc9b7336bec..422100e27b9 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1101,11 +1101,11 @@ recover are present in Emacs buffers.  You should then save them.  Only
 this---saving them---updates the files themselves.
 
 @vindex auto-save-list-file-prefix
-  Emacs records information about interrupted sessions for later
-recovery in files named @file{.saves-@var{pid}-@var{hostname}} in the
-directory @file{~/.emacs.d/auto-save-list/}.  This directory is
-determined by the variable @code{auto-save-list-file-prefix}.  If you
-set @code{auto-save-list-file-prefix} to @code{nil}, sessions are not
+  Emacs records information about interrupted sessions in files named
+@file{.saves-@var{pid}-@var{hostname}} in the directory
+@file{~/.emacs.d/auto-save-list/}.  This directory is determined by
+the variable @code{auto-save-list-file-prefix}.  If you set
+@code{auto-save-list-file-prefix} to @code{nil}, sessions are not
 recorded for recovery.
 
 @node File Aliases
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index f67654bffc2..fee91d370c3 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -499,7 +499,8 @@ Add a line to your init file, modifying the variable
 (@pxref{Frame Parameters}), like this:
 
 @example
-(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
+(add-to-list 'default-frame-alist
+             '(font . "DejaVu Sans Mono-10"))
 @end example
 
 @cindex X defaults file
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 893234492b8..0912cfe5311 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -40,8 +40,8 @@ An @acronym{ASCII} control character is the Control version of an upper-case
 letter, or the Control version of one of the characters @samp{@@[\]^_?}.
 
 @item @acronym{ASCII} printing character
-@acronym{ASCII} printing characters include letters, digits, space, and these
-punctuation characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
+@acronym{ASCII} letters, digits, space, and the following punctuation
+characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
 
 @item Auto Fill Mode
 Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index f874c28ec3c..da378187873 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -903,11 +903,11 @@ Display the changes that will be sent by the next push operation
 
 @kindex C-x v l
 @findex vc-print-log
-  The command @kbd{C-x v l} (@code{vc-print-log}) displays a buffer
-named @file{*vc-change-log*}, showing the history of changes made to
-the current file, including who made the changes, the dates, and the
-log entry for each change (these are the same log entries you would
-enter via the @file{*vc-log*} buffer; @pxref{Log Buffer}).  Point is
+  @kbd{C-x v l} (@code{vc-print-log}) displays a buffer named
+@file{*vc-change-log*}, showing the history of changes made to the
+current file, including who made the changes, the dates, and the log
+entry for each change (these are the same log entries you would enter
+via the @file{*vc-log*} buffer; @pxref{Log Buffer}).  Point is
 centered at the revision of the file currently being visited.  With a
 prefix argument, the command prompts for the revision to center on,
 and the maximum number of revisions to display.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 14bb2c8dc95..90072d19a69 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2257,18 +2257,18 @@ editors.  Standard facilities can emulate these:
 @cindex Brief emulation
 @cindex emulation of Brief
 @cindex mode, CRiSP
-You can turn on key bindings to emulate the CRiSP/Brief editor with
-@kbd{M-x crisp-mode}.  Note that this rebinds @kbd{M-x} to exit Emacs
-unless you set the variable @code{crisp-override-meta-x}.  You can
-also use the command @kbd{M-x scroll-all-mode} or set the variable
+@kbd{M-x crisp-mode} enables key bindings to emulate the CRiSP/Brief
+editor.  Note that this rebinds @kbd{M-x} to exit Emacs unless you set
+the variable @code{crisp-override-meta-x}.  You can also use the
+command @kbd{M-x scroll-all-mode} or set the variable
 @code{crisp-load-scroll-all} to emulate CRiSP's scroll-all feature
 (scrolling all windows together).
 
 @item EDT (DEC VMS editor)
 @findex edt-emulation-on
 @findex edt-emulation-off
-Turn on EDT emulation @kbd{M-x edt-emulation-on}; use @kbd{M-x
-edt-emulation-off} to restore normal Emacs command bindings.
+Turn on EDT emulation with @kbd{M-x edt-emulation-on}; restore normal
+command bindings with @kbd{M-x edt-emulation-off}.
 
 Most of the EDT emulation commands are keypad keys, and most standard
 Emacs key bindings are still available.  The EDT emulation rebindings
@@ -2454,7 +2454,7 @@ point (@code{dired-at-point}).
 @code{ffap-read-only-other-window}, analogous to
 @code{find-file-read-only-other-window}.
 @item C-x 4 d
-@code{ffap-dired-other-window}, analogous to @code{dired-other-window}.
+@code{ffap-dired-other-window}, like @code{dired-other-window}.
 @item C-x 5 f
 @kindex C-x 5 f @r{(FFAP)}
 @code{ffap-other-frame}, analogous to @code{find-file-other-frame}.
@@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}).
 
 @findex animate-birthday-present
 @cindex animate
-  The @code{animate} package makes text dance (e.g. try
-@kbd{M-x animate-birthday-present}).
+  The @code{animate} package makes text dance (e.g.  @kbd{M-x
+animate-birthday-present}).
 
 @findex blackbox
 @findex mpuz
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index c556d864398..d8f9bb6961d 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -415,16 +415,15 @@ names, which might cause misalignment of columns in Dired display.
 @section HOME and Startup Directories on MS-Windows
 @cindex @code{HOME} directory on MS-Windows
 
-  The Windows equivalent of the @code{HOME} directory is the
-@dfn{user-specific application data directory}.  The actual location
-depends on the Windows version; typical values are @file{C:\Documents
-and Settings\@var{username}\Application Data} on Windows 2K/XP/2K3,
-@file{C:\Users\@var{username}\AppData\Roaming} on Windows Vista/7/2K8,
-and either @file{C:\WINDOWS\Application Data} or
-@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the
-older Windows 9X/ME systems.  If this directory does not exist or
-cannot be accessed, Emacs falls back to @file{C:\} as the default
-value of @code{HOME}.
+  The Windows equivalent of @code{HOME} is the @dfn{user-specific
+application data directory}.  The actual location depends on the
+Windows version; typical values are @file{C:\Documents and
+Settings\@var{username}\Application Data} on Windows 2000/XP/2K3,
+@file{C:\Users\@var{username}\AppData\Roaming} on Windows
+Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or
+@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows
+9X/ME.  If this directory does not exist or cannot be accessed, Emacs
+falls back to @file{C:\} as the default value of @code{HOME}.
 
   You can override this default value of @code{HOME} by explicitly
 setting the environment variable @env{HOME} to point to any directory
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 0a3829a6a2f..59e945eee96 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1111,11 +1111,11 @@ in communication with other processes.
 @table @kbd
 @item C-x @key{RET} x @var{coding} @key{RET}
 Use coding system @var{coding} for transferring selections to and from
-other window-based applications (@code{set-selection-coding-system}).
+other graphical applications (@code{set-selection-coding-system}).
 
 @item C-x @key{RET} X @var{coding} @key{RET}
 Use coding system @var{coding} for transferring @emph{one}
-selection---the next one---to or from another window-based application
+selection---the next one---to or from another graphical application
 (@code{set-next-selection-coding-system}).
 
 @item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET}
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 3c9611a05a0..e5340655770 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1651,7 +1651,8 @@ the keymap is loaded before we try to change it.
 
 @example
 (defun my-bind-clb ()
-  (define-key c-mode-base-map "\C-j" 'c-context-line-break))
+  (define-key c-mode-base-map "\C-j"
+              'c-context-line-break))
 (add-hook 'c-initialization-hook 'my-bind-clb)
 @end example
 
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index bf2b41cdbe0..8802e5392d7 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -74,8 +74,8 @@ CC: mongol.soldier@@example.net, rms@@gnu.org
 Subject: Re: What is best in life?
 From: conan@@example.org
 --text follows this line--
-To crush your enemies, see them driven before you, and to hear the
-lamentation of their women.
+To crush your enemies, see them driven before you, and to
+hear the lamentation of their women.
 @end example
 
 @noindent
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index fa33daa94d7..f10e78e17ad 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1015,11 +1015,11 @@ Both accept numeric arguments as repeat counts.
 @kindex C-c C-f @r{(Outline mode)}
 @kindex C-c C-b @r{(Outline mode)}
 @kindex C-c C-u @r{(Outline mode)}
-  The commands @kbd{C-c C-f} (@code{outline-forward-same-level}) and
-@kbd{C-c C-b} (@code{outline-backward-same-level}) move from one
-heading line to another visible heading at the same depth in the
-outline.  @kbd{C-c C-u} (@code{outline-up-heading}) moves backward to
-another heading that is less deeply nested.
+  @kbd{C-c C-f} (@code{outline-forward-same-level}) and @kbd{C-c C-b}
+(@code{outline-backward-same-level}) move from one heading line to
+another visible heading at the same depth in the outline.  @kbd{C-c
+C-u} (@code{outline-up-heading}) moves backward to another heading
+that is less deeply nested.
 
 @node Outline Visibility
 @subsection Outline Visibility Commands
@@ -2311,8 +2311,7 @@ hides text), and @code{intangible} (which disallows moving point
 within the text).  The @samp{Remove Special} menu item removes all of
 these special properties from the text in the region.
 
-  The @code{invisible} and @code{intangible} properties are not saved
-in the @samp{text/enriched} format.
+  The @code{invisible} and @code{intangible} properties are not saved.
 
 @node Text Based Tables
 @section Editing Text-based Tables
@@ -2345,8 +2344,8 @@ large to fit in the cell.  You can use the commands defined in the
 following sections for navigating and editing the table layout.
 
 @findex table-fixed-width-mode
-  To toggle the automatic table resizing feature, type @kbd{M-x
-table-fixed-width-mode}.
+  Type @kbd{M-x table-fixed-width-mode} to toggle the automatic table
+resizing feature.
 
 @menu
 * Table Definition::          What is a text based table.
@@ -2506,15 +2505,16 @@ result in an illegitimate cell layout.
 @cindex text-based tables, splitting cells
 @cindex splitting table cells
   @kbd{M-x table-split-cell} splits the current cell vertically or
-horizontally, prompting for the direction with the minibuffer.  The
-commands @kbd{M-x table-split-cell-vertically} and @kbd{M-x
-table-split-cell-horizontally} split in a specific direction.  When
-splitting vertically, the old cell contents are automatically split
-between the two new cells.  When splitting horizontally, you are
-prompted for how to divide the cell contents, if the cell is
-non-empty; the options are @samp{split} (divide the contents at
-point), @samp{left} (put all the contents in the left cell), and
-@samp{right} (put all the contents in the right cell).
+horizontally, prompting for the direction with the minibuffer.  To
+split in a specific direction, use @kbd{M-x
+table-split-cell-vertically} and @kbd{M-x
+table-split-cell-horizontally}.  When splitting vertically, the old
+cell contents are automatically split between the two new cells.  When
+splitting horizontally, you are prompted for how to divide the cell
+contents, if the cell is non-empty; the options are @samp{split}
+(divide the contents at point), @samp{left} (put all the contents in
+the left cell), and @samp{right} (put all the contents in the right
+cell).
 
   The following commands enlarge or shrink a cell.  By default, they
 resize by one row or column; if a numeric argument is supplied, that