Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270

12 files changed, 85 insertions, 50 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9d5e6158f3f..68c150a67c9 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,38 @@
+2007-10-18  Martin Rudalics  <rudalics@gmx.at>
+
+        * trouble.texi (Quitting): Fix typo.
+
+2007-10-18  Glenn Morris  <rgm@gnu.org>
+
+        * frames.texi (Mode Line Mouse): Mention minor mode names.
+
+2007-10-17  Juri Linkov  <juri@jurta.org>
+
+        * text.texi (Fill Commands): Undocument fill-paragraph-or-region.
+        fill-paragraph operates on the active region in Transient Mark mode.
+        (Fill Prefix, Format Indentation): Replace fill-paragraph-or-region
+        with fill-paragraph.
+
+        * basic.texi (Arguments): Replace fill-paragraph-or-region with
+        fill-paragraph.
+
+        * fixit.texi (Spelling): ispell-word operates on the active region
+        in Transient Mark mode.
+
+2007-10-17  Aaron S. Hawley  <aaronh@garden.org>
+
+        * building.texi (Source Buffers):
+        * custom.texi (Init Non-ASCII):
+        * glossary.texi (Glossary): Use "key binding" consistently.
+
+2007-10-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * calendar.texi (Diary): Fix directive.
+
+2007-10-16  Richard Stallman  <rms@gnu.org>
+
+        * calendar.texi (Diary): Clarify text about diary file example.
+
 2007-10-13  Eric S. Raymond  <esr@snark.thyrsus.com>
 
         * files.texi: Capitalize node names according to convention.
@@ -10,7 +45,7 @@
 
         * emacs.texi:
         * files.texi (Version Systems): Minor fixes to version-control material
-        suggseted by RMS and Robert J. Chassell.
+        suggested by RMS and Robert J. Chassell.
 
 2007-10-10  Eric S. Raymond  <esr@snark.thyrsus.com>
 
@@ -18,9 +53,9 @@
         * vc-xtra.texi:
         * vc1-xtra.texi:
         * vc2-xtra.texi: Merge in changes for new VC with fileset-oriented
-        operations.  Change of terminology from 'version' to `revision'.
+        operations.  Change of terminology from `version' to `revision'.
         Revise text for adequate description of VCSes with monotonic IDs.
-        * emacs.texi: Change of terminology from 'version' to `revision'.
+        * emacs.texi: Change of terminology from `version' to `revision'.
 
 2007-10-09  Eric S. Raymond  <esr@snark.thyrsus.com>
 
@@ -53,7 +88,7 @@
 2007-10-06  Eric S. Raymond  <esr@snark.thyrsus.com>
 
         * files.texi: Update the section on version control for 2007
-        conditions. None of these changes are new-VC-specific; that
+        conditions.  None of these changes are new-VC-specific; that
         will come later.
 
 2007-09-15  Glenn Morris  <rgm@gnu.org>
@@ -173,7 +208,7 @@
 
 2007-06-24  Karl Berry  <karl@gnu.org>
 
-        * emacs.texi: new Back-Cover Text.
+        * emacs.texi: New Back-Cover Text.
 
 2007-06-07  Alan Mackenzie  <acm@muc.de>
 
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 418d54f677b..333985e4a4a 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -707,7 +707,7 @@ C-n} (move down a good fraction of a screen), @kbd{C-u C-u C-o} (make
 ``a lot'' of blank lines), and @kbd{C-u C-k} (kill four lines).
 
   Some commands care whether there is an argument, but ignore its
-value.  For example, the command @kbd{M-q} (@code{fill-paragraph-or-region})
+value.  For example, the command @kbd{M-q} (@code{fill-paragraph})
 fills text; with an argument, it justifies the text as well.
 (@xref{Filling}, for more information on @kbd{M-q}.)  Plain @kbd{C-u}
 is a handy way of providing an argument for such commands.
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 5689bf1fe34..45210118f77 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -911,7 +911,7 @@ places.
 
 @c @findex gdb-mouse-set-clear-breakpoint
 @c @findex gdb-mouse-toggle-breakpoint
-Many GDB commands can be entered using keybindings or the tool bar but
+Many GDB commands can be entered using key bindings or the tool bar but
 sometimes it is quicker to use the fringe.  These commands either
 manipulate breakpoints or control program execution.  When there is no
 fringe, you can use the margin but this is only present when the
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 1357784b920..6b285094735 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -989,9 +989,8 @@ events for today, for the immediate future, or for any specified
 date.
 
   The name of the diary file is specified by the variable
-@code{diary-file}; @file{~/diary} is the default.  A sample diary file
-is (note that the file format is essentially the same as that used by
-the external shell utility @samp{calendar}):
+@code{diary-file}; @file{~/diary} is the default.  Here's an example
+showing what that file looks like:
 
 @example
 12/22/1988  Twentieth wedding anniversary!!
@@ -1008,8 +1007,10 @@ April 15, 1989 Income tax due.
 @end example
 
 @noindent
-This example uses extra spaces to align the event descriptions of most
-of the entries.  Such formatting is purely a matter of taste.
+This format is essentially the same as the one used by the system's
+@command{calendar} utility.  This example uses extra spaces to align
+the event descriptions of most of the entries.  Such formatting is
+purely a matter of taste.
 
   Although you probably will start by creating a diary manually, Emacs
 provides a number of commands to let you view, add, and change diary
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 1276c45af70..29d1c902b7c 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2505,7 +2505,7 @@ Type @kbd{C-q}, followed by the key you want to bind, to insert @var{char}.
 
   @strong{Warning:} if you change the keyboard encoding, or change
 between multibyte and unibyte mode, or anything that would alter which
-code @kbd{C-q} would insert for that character, this keybinding may
+code @kbd{C-q} would insert for that character, this key binding may
 stop working.  It is therefore advisable to use one and only one
 coding system, for your init file as well as the files you edit.  For
 example, don't mix the @samp{latin-1} and @samp{latin-9} coding
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index d1577e2f528..2d827f5a1a2 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -325,7 +325,9 @@ you give an explicit command to do so.
   To check the spelling of the word around or before point, and
 optionally correct it as well, use the command @kbd{M-$}
 (@code{ispell-word}).  If the word is not correct, the command offers
-you various alternatives for what to do about it.
+you various alternatives for what to do about it.  When the mark is
+active in Transient Mark mode, this command operates on the active
+region like @code{ispell-region}.
 
 @findex ispell-buffer
 @findex ispell-region
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index a45b582b455..e1207738cfa 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -430,8 +430,8 @@ This menu is for specifying the frame's default font.
   You can use mouse clicks on window mode lines to select and manipulate
 windows.
 
-  Some areas of the mode line, such as the buffer name and the major
-mode name, have their own special mouse bindings.  These areas are
+  Some areas of the mode line, such as the buffer name, and major and minor
+mode names, have their own special mouse bindings.  These areas are
 highlighted when you hold the mouse over them, and information about
 the special bindings will be displayed (@pxref{Tooltips}).  This
 section's commands do not apply in those areas.
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index f289c2ca1cb..a9109de667b 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -658,7 +658,7 @@ Justification means adding extra spaces within lines of text to make
 them extend exactly to a specified width.
 @xref{Format Justification}.
 
-@item Keybinding
+@item Key Binding
 See `binding.'
 
 @item Keyboard Macro
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 9cfd4ffe922..c151c75e8bb 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -486,11 +486,9 @@ The section on init files says how to arrange this permanently for yourself.
 
 @table @kbd
 @item M-q
-Fill current paragraph or active region (@code{fill-paragraph-or-region}).
+Fill current paragraph (@code{fill-paragraph}).
 @item C-x f
 Set the fill column (@code{set-fill-column}).
-@item M-x fill-paragraph
-Fill current paragraph (@code{fill-paragraph}).
 @item M-x fill-region
 Fill each paragraph in the region (@code{fill-region}).
 @item M-x fill-region-as-paragraph
@@ -499,39 +497,35 @@ Fill the region, considering it as one paragraph.
 Center a line.
 @end table
 
+@kindex M-q
 @findex fill-paragraph
-  To refill a paragraph, use @kbd{M-x fill-paragraph}.  This operates
-on the paragraph that point is inside, or the one after point if point
-is between paragraphs.  Refilling works by removing all the
-line-breaks, then inserting new ones where necessary.
+  To refill a paragraph, use the command @kbd{M-q}
+(@code{fill-paragraph}).  This operates on the paragraph that point is
+inside, or the one after point if point is between paragraphs.
+Refilling works by removing all the line-breaks, then inserting new ones
+where necessary.  When the mark is active in Transient Mark mode, this
+command operates on the active region like @code{fill-region}.
 
 @findex fill-region
   To refill many paragraphs, use @kbd{M-x fill-region}, which
 finds the paragraphs in the region and fills each of them.
 
-@kindex M-q
-@findex fill-paragraph-or-region
-  The command @kbd{M-q} (@code{fill-paragraph-or-region}), operates on
-the active region like @code{fill-region} when the mark is active in
-Transient Mark mode.  Otherwise, it operates on the current paragraph
-like @code{fill-paragraph}.
-
 @findex fill-region-as-paragraph
-  @kbd{M-q}, @code{fill-paragraph} and @code{fill-region} use the same
-criteria as @kbd{M-h} for finding paragraph boundaries (@pxref{Paragraphs}).
-For more control, you can use @kbd{M-x fill-region-as-paragraph},
-which refills everything between point and mark as a single paragraph.
-This command deletes any blank lines within the region, so separate
-blocks of text end up combined into one block.
+  @kbd{M-q} and @code{fill-region} use the same criteria as @kbd{M-h}
+for finding paragraph boundaries (@pxref{Paragraphs}).  For more
+control, you can use @kbd{M-x fill-region-as-paragraph}, which refills
+everything between point and mark as a single paragraph.  This command
+deletes any blank lines within the region, so separate blocks of text
+end up combined into one block.
 
 @cindex justification
   A numeric argument to @kbd{M-q} tells it to @dfn{justify} the text
 as well as filling it.  This means that extra spaces are inserted to
 make the right margin line up exactly at the fill column.  To remove
 the extra spaces, use @kbd{M-q} with no argument.  (Likewise for
-@code{fill-paragraph} and @code{fill-region}.)  Another way to control
-justification, and choose other styles of filling, is with the
-@code{justification} text property; see @ref{Format Justification}.
+@code{fill-region}.)  Another way to control justification, and choose
+other styles of filling, is with the @code{justification} text
+property; see @ref{Format Justification}.
 
 @kindex M-s @r{(Text mode)}
 @cindex centering
@@ -595,7 +589,7 @@ fill prefix automatically (@pxref{Adaptive Fill}).
 @item C-x .
 Set the fill prefix (@code{set-fill-prefix}).
 @item M-q
-Fill a paragraph using current fill prefix (@code{fill-paragraph-or-region}).
+Fill a paragraph using current fill prefix (@code{fill-paragraph}).
 @item M-x fill-individual-paragraphs
 Fill the region, considering each change of indentation as starting a
 new paragraph.
@@ -2256,7 +2250,7 @@ margin width either with a numeric argument or in the minibuffer.
 
   Sometimes, as a result of editing, the filling of a paragraph becomes
 messed up---parts of the paragraph may extend past the left or right
-margins.  When this happens, use @kbd{M-q} (@code{fill-paragraph-or-region}) to
+margins.  When this happens, use @kbd{M-q} (@code{fill-paragraph}) to
 refill the paragraph.
 
   The fill prefix, if any, works in addition to the specified paragraph
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index ea494445a4e..494637c8eeb 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -84,7 +84,7 @@ waiting for the operating system to do something, quitting is
 impossible unless special pains are taken for the particular system
 call within Emacs where the waiting occurs.  We have done this for the
 system calls that users are likely to want to quit from, but it's
-possible you will a case not handled.  In one very common
+possible you will encounter a case not handled.  In one very common
 case---waiting for file input or output using NFS---Emacs itself knows
 how to quit, but many NFS implementations simply do not allow user
 programs to stop waiting for NFS when the NFS server is hung.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d95597e940b..e0d9db962f9 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-17  Juri Linkov  <juri@jurta.org>
+
+        * text.texi (Filling): Update arguments of fill-paragraph.
+        fill-paragraph operates on the active region in Transient Mark mode.
+        Remove fill-paragraph-or-region.
+
 2007-10-13  Karl Berry  <karl@gnu.org>
 
         * elisp.texi (@dircategory): Move to after @copying,
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index daaaf6c9b9d..5b935bc6e23 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1432,11 +1432,14 @@ as @code{full}.
   When you call the filling functions interactively, using a prefix
 argument implies the value @code{full} for @var{justify}.
 
-@deffn Command fill-paragraph justify
+@deffn Command fill-paragraph &optional justify region
 This command fills the paragraph at or after point.  If
 @var{justify} is non-@code{nil}, each line is justified as well.
 It uses the ordinary paragraph motion commands to find paragraph
 boundaries.  @xref{Paragraphs,,, emacs, The GNU Emacs Manual}.
+Interactively, when @var{region} is non-@code{nil} in Transient Mark
+mode and the mark is active, this command calls @code{fill-region}
+on the active region.
 @end deffn
 
 @deffn Command fill-region start end &optional justify nosqueeze to-eop
@@ -1453,12 +1456,6 @@ The variable @code{paragraph-separate} controls how to distinguish
 paragraphs.  @xref{Standard Regexps}.
 @end deffn
 
-@deffn Command fill-paragraph-or-region justify
-In Transient Mark mode, when the mark is active, this command calls
-@code{fill-region} on the active region.  Otherwise, it calls
-@code{fill-paragraph}.
-@end deffn
-
 @deffn Command fill-individual-paragraphs start end &optional justify citation-regexp
 This command fills each paragraph in the region according to its
 individual fill prefix.  Thus, if the lines of a paragraph were indented