Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

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

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

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

10 files changed, 142 insertions, 83 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index ee0dac8359c..388800b99ae 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,31 @@
+2006-09-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * rcirc.texi (Internet Relay Chat, Useful IRC commands): Don't use
+        @indicateurl.
+
+        * cc-mode.texi (Subword Movement): Don't use @headitem.
+        (Custom Braces, Clean-ups): Don't use @tie.
+
+2006-08-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.54.
+
+        * tramp.texi (Bug Reports): The Tramp mailing list is moderated
+        now.  Suggested by Adrian Phillips <a.phillips@met.no>.
+
+2006-08-28  Richard Stallman  <rms@gnu.org>
+
+        * windows.texi (Split Window): Update xref.
+
+        * basic.texi (Continuation Lines): Update xref.
+
+        * indent.texi (Tab Stops): Update xref.
+
+        * emacs.texi (Top): Update subnode menu.
+
+        * display.texi (Line Truncation, Displaying Boundaries): New nodes,
+        split out of Display Custom.
+
 2006-08-25  Kim F. Storm  <storm@cua.dk>
 
         * display.texi (Display Custom): Add variables overline-margin
diff --git a/man/basic.texi b/man/basic.texi
index 6f0e7cad68c..5d91685e9e4 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -480,7 +480,7 @@ does not appear at all.  @samp{$} in the last column or a small
 straight arrow in the window's right fringe indicates a truncated
 line.
 
-  @xref{Display Custom}, for more about line truncation,
+  @xref{Line Truncation}, for more about line truncation,
 and other variables that control how text is displayed.
 
 @node Position Info
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 699283528a9..395433bc899 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -1624,8 +1624,16 @@ these mixed case symbols @dfn{nomenclatures}.  Also, each capitalized
 @dfn{subword}.  Here are some examples:
 
 @multitable {@samp{NSGraphicsContext}} {@samp{NS}, @samp{Graphics}, and @samp{Context}}
-@headitem Nomenclature
+@c This could be converted to @headitem when we require Texinfo 4.7
+@iftex
+@item @b{Nomenclature}
+  @tab @b{Subwords}
+@end iftex
+@ifnottex
+@item Nomenclature
   @tab Subwords
+@item ---------------------------------------------------------
+@end ifnottex
 @item @samp{GtkWindow}
   @tab @samp{Gtk} and @samp{Window}
 @item @samp{EmacsFrameClass}
@@ -1657,7 +1665,14 @@ nomenclature and treat them as separate words:
 @findex c-downcase-subword
 @findex downcase-subword (c-)
 @multitable @columnfractions .20 .40 .40
-@headitem Key         @tab Word oriented command     @tab Subword oriented command
+@c This could be converted to @headitem when we require Texinfo 4.7
+@iftex
+@item     @b{Key}     @tab @b{Word oriented command} @tab @b{Subword oriented command}
+@end iftex
+@ifnottex
+@item     Key         @tab Word oriented command     @tab Subword oriented command
+@item ----------------------------------------------------------------------------
+@end ifnottex
 @item     @kbd{M-f}   @tab @code{forward-word}       @tab @code{c-forward-subword}
 @item     @kbd{M-b}   @tab @code{backward-word}      @tab @code{c-backward-subword}
 @item     @kbd{M-@@}  @tab @code{mark-word}          @tab @code{c-mark-subword}
@@ -3231,9 +3246,9 @@ give @code{c-syntactic-context} a value yourself---this would disrupt
 the proper functioning of @ccmode{}.
 
 This variable is also bound in three other circumstances:
-(i)@tie{}when calling a c-hanging-semi&comma-criteria function
-(@pxref{Hanging Semicolons and Commas}; (ii)@tie{}when calling a
-line-up function (@pxref{Custom Line-Up}; (iii)@tie{}when calling a
+(i)@w{ }when calling a c-hanging-semi&comma-criteria function
+(@pxref{Hanging Semicolons and Commas}; (ii)@w{ }when calling a
+line-up function (@pxref{Custom Line-Up}; (iii)@w{ }when calling a
 c-special-indent-hook function (@pxref{Other Indentation}).
 @end defvar
 
@@ -3630,8 +3645,8 @@ Auto-newline minor mode are enabled:
 @item space-before-funcall
 Insert a space between the function name and the opening parenthesis
 of a function call.  This produces function calls in the style
-mandated by the GNU coding standards, e.g. @samp{signal@tie{}(SIGINT,
-SIG_IGN)} and @samp{abort@tie{}()}.  Clean up occurs when the opening
+mandated by the GNU coding standards, e.g. @samp{signal@w{ }(SIGINT,
+SIG_IGN)} and @samp{abort@w{ }()}.  Clean up occurs when the opening
 parenthesis is typed.  This clean-up should never be active in AWK
 Mode, since such a space is syntactically invalid for user defined
 functions.
diff --git a/man/display.texi b/man/display.texi
index 2a0abd4bef6..74d2ba5eb62 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -23,11 +23,14 @@ their values only make a difference at the time of redisplay.
 * Font Lock::              Minor mode for syntactic highlighting using faces.
 * Highlight Interactively:: Tell Emacs what text to highlight.
 * Fringes::                Enabling or disabling window fringes.
+* Displaying Boundaries::  Displaying top and bottom of the buffer.
 * Useless Whitespace::     Showing possibly-spurious trailing whitespace.
 * Selective Display::      Hiding lines with lots of indentation.
 * Optional Mode Line::     Optional mode line display features.
 * Text Display::           How text characters are normally displayed.
 * Cursor Display::         Features for displaying the cursor.
+* Line Truncation::        Truncating lines to fit the screen width instead
+                             of continuing them to multiple screen lines.
 * Display Custom::         Information on variables for customizing display.
 @end menu
 
@@ -202,8 +205,8 @@ window, Emacs recenters the window.  By default, @code{scroll-margin} is
   @dfn{Horizontal scrolling} means shifting all the lines sideways
 within a window---so that some of the text near the left margin is not
 displayed at all.  When the text in a window is scrolled horizontally,
-text lines are truncated rather than continued (@pxref{Display
-Custom}).  Whenever a window shows truncated lines, Emacs
+text lines are truncated rather than continued (@pxref{Line
+Truncation}).  Whenever a window shows truncated lines, Emacs
 automatically updates its horizontal scrolling whenever point moves
 off the left or right edge of the screen.  You can also use these
 commands to do explicit horizontal scrolling.
@@ -751,6 +754,40 @@ program you are debugging is executing (@pxref{Debuggers}).
 @kbd{M-x fringe-mode}.  To enable and disable the fringes
 for the selected frame, use @kbd{M-x set-fringe-style}.
 
+@node Displaying Boundaries
+@section Displaying Boundaries
+
+@vindex indicate-buffer-boundaries
+  On a graphical display, Emacs can indicate the buffer boundaries in
+the fringes.  It indicates the first line and the last line with
+angle images in the fringes.  This can be combined with up and down
+arrow images which say whether it is possible to scroll the window up
+and down.
+
+  The buffer-local variable @code{indicate-buffer-boundaries} controls
+how the buffer boundaries and window scrolling is indicated in the
+fringes.  If the value is @code{left} or @code{right}, both angle and
+arrow bitmaps are displayed in the left or right fringe, respectively.
+
+  If value is an alist, each element @code{(@var{indicator} .
+@var{position})} specifies the position of one of the indicators.
+The @var{indicator} must be one of @code{top}, @code{bottom},
+@code{up}, @code{down}, or @code{t} which specifies the default
+position for the indicators not present in the alist.
+The @var{position} is one of @code{left}, @code{right}, or @code{nil}
+which specifies not to show this indicator.
+
+  For example, @code{((top . left) (t . right))} places the top angle
+bitmap in left fringe, the bottom angle bitmap in right fringe, and
+both arrow bitmaps in right fringe.  To show just the angle bitmaps in
+the left fringe, but no arrow bitmaps, use @code{((top .  left)
+(bottom . left))}.
+
+@vindex default-indicate-buffer-boundaries
+  The value of the variable @code{default-indicate-buffer-boundaries}
+is the default value for @code{indicate-buffer-boundaries} in buffers
+that do not override it.
+
 @node Useless Whitespace
 @section Useless Whitespace
 
@@ -1083,30 +1120,8 @@ minor mode that highlights the line containing point.  Use @kbd{M-x
 hl-line-mode} to enable or disable it in the current buffer.  @kbd{M-x
 global-hl-line-mode} enables or disables the same mode globally.
 
-@node Display Custom
-@section Customization of Display
-
-  This section describes variables (@pxref{Variables}) that you can
-change to customize how Emacs displays.  Beginning users can skip
-it.
-@c the reason for that pxref is because an xref early in the
-@c ``echo area'' section leads here.
-
-@vindex inverse-video
-  If the variable @code{inverse-video} is non-@code{nil}, Emacs attempts
-to invert all the lines of the display from what they normally are.
-
-@vindex visible-bell
-  If the variable @code{visible-bell} is non-@code{nil}, Emacs attempts
-to make the whole screen blink when it would normally make an audible bell
-sound.  This variable has no effect if your terminal does not have a way
-to make the screen blink.
-
-@vindex echo-keystrokes
-  The variable @code{echo-keystrokes} controls the echoing of multi-character
-keys; its value is the number of seconds of pause required to cause echoing
-to start, or zero, meaning don't echo at all.  The value takes effect when
-there is someting to echo.  @xref{Echo Area}.
+@node Line Truncation
+@section Truncation of Lines
 
 @cindex truncation
 @cindex line truncation, and fringes
@@ -1145,36 +1160,30 @@ truncate a line which is exactly as wide as the window.  Instead, the
 newline overflows into the right fringe, and the cursor appears in the
 fringe when positioned on that newline.
 
-@vindex indicate-buffer-boundaries
-  On a graphical display, Emacs can indicate the buffer boundaries in
-the fringes.  It indicates the first line and the last line with
-angle images in the fringes.  This can be combined with up and down
-arrow images which say whether it is possible to scroll the window up
-and down.
+@node Display Custom
+@section Customization of Display
 
-  The buffer-local variable @code{indicate-buffer-boundaries} controls
-how the buffer boundaries and window scrolling is indicated in the
-fringes.  If the value is @code{left} or @code{right}, both angle and
-arrow bitmaps are displayed in the left or right fringe, respectively.
+  This section describes variables (@pxref{Variables}) that you can
+change to customize how Emacs displays.  Beginning users can skip
+it.
+@c the reason for that pxref is because an xref early in the
+@c ``echo area'' section leads here.
 
-  If value is an alist, each element @code{(@var{indicator} .
-@var{position})} specifies the position of one of the indicators.
-The @var{indicator} must be one of @code{top}, @code{bottom},
-@code{up}, @code{down}, or @code{t} which specifies the default
-position for the indicators not present in the alist.
-The @var{position} is one of @code{left}, @code{right}, or @code{nil}
-which specifies not to show this indicator.
+@vindex inverse-video
+  If the variable @code{inverse-video} is non-@code{nil}, Emacs attempts
+to invert all the lines of the display from what they normally are.
 
-  For example, @code{((top . left) (t . right))} places the top angle
-bitmap in left fringe, the bottom angle bitmap in right fringe, and
-both arrow bitmaps in right fringe.  To show just the angle bitmaps in
-the left fringe, but no arrow bitmaps, use @code{((top .  left)
-(bottom . left))}.
+@vindex visible-bell
+  If the variable @code{visible-bell} is non-@code{nil}, Emacs attempts
+to make the whole screen blink when it would normally make an audible bell
+sound.  This variable has no effect if your terminal does not have a way
+to make the screen blink.
 
-@vindex default-indicate-buffer-boundaries
-  The value of the variable @code{default-indicate-buffer-boundaries}
-is the default value for @code{indicate-buffer-boundaries} in buffers
-that do not override it.
+@vindex echo-keystrokes
+  The variable @code{echo-keystrokes} controls the echoing of multi-character
+keys; its value is the number of seconds of pause required to cause echoing
+to start, or zero, meaning don't echo at all.  The value takes effect when
+there is someting to echo.  @xref{Echo Area}.
 
 @vindex baud-rate
   The variable @anchor{baud-rate}@code{baud-rate} holds the output
@@ -1197,6 +1206,17 @@ or off, customize the group @code{cursor}.  You can also control the
 amount of time Emacs must remain busy before the busy indicator is
 displayed, by setting the variable @code{hourglass-delay}.
 
+@vindex overline-margin
+  On graphical display, this variables specifies the vertical position
+of an overline above the text, including the height of the overline
+itself (1 pixel).  The default value is 2 pixels.
+
+@vindex x-underline-at-descent-line
+  On graphical display, Emacs normally draws an underline at the
+baseline level of the font.  If @code{x-underline-at-descent-line} is
+non-@code{nil}, Emacs draws the underline at the same height as the
+font's descent line.
+
 @findex tty-suppress-bold-inverse-default-colors
   On some text-only terminals, bold face and inverse video together
 result in text that is hard to read.  Call the function
@@ -1215,17 +1235,6 @@ page for other output.  On such terminals, you might want to set the variable
 assume, when resumed, that the screen page it is using still contains
 what Emacs last wrote there.
 
-@vindex overline-margin
-  On graphical display, this variables specifies the number of pixes
-the overline is shown above the text.  The value includes the height of
-the overline itself (1 pixel).  The default value is 2 pixels.
-
-@vindex x-underline-at-descent-line
-  On graphical display, the underline is normally drawn at the
-baseline level of the font.  If @code{x-underline-at-descent-line} is
-non-@code{nil}, the underline is drawn at the same position as the
-font's decent line.
-
 @ignore
    arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
 @end ignore
diff --git a/man/emacs.texi b/man/emacs.texi
index 780b5c97b6e..503ec74bffd 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -329,11 +329,14 @@ Controlling the Display
 * Font Lock::              Minor mode for syntactic highlighting using faces.
 * Highlight Interactively:: Tell Emacs what text to highlight.
 * Fringes::                Enabling or disabling window fringes.
+* Displaying Boundaries::  Displaying top and bottom of the buffer.
 * Useless Whitespace::     Showing possibly-spurious trailing whitespace.
 * Selective Display::      Hiding lines with lots of indentation.
 * Optional Mode Line::     Optional mode line display features.
 * Text Display::           How text characters are normally displayed.
 * Cursor Display::         Features for displaying the cursor.
+* Line Truncation::        Truncating lines to fit the screen width instead
+                             of continuing them to multiple screen lines.
 * Display Custom::         Information on variables for customizing display.
 
 Searching and Replacement
diff --git a/man/indent.texi b/man/indent.texi
index d5c69daa192..9462b1b3fac 100644
--- a/man/indent.texi
+++ b/man/indent.texi
@@ -212,7 +212,7 @@ To install changes, type C-c C-c
 are present just to help you see where the colons are and know what to do.
 
   Note that the tab stops that control @code{tab-to-tab-stop} have nothing
-to do with displaying tab characters in the buffer.  @xref{Display Custom},
+to do with displaying tab characters in the buffer.  @xref{Text Display},
 for more information on that.
 
 @node Just Spaces,, Tab Stops, Indentation
diff --git a/man/rcirc.texi b/man/rcirc.texi
index 606e6beea06..15744e6642c 100644
--- a/man/rcirc.texi
+++ b/man/rcirc.texi
@@ -118,7 +118,7 @@ Here's a typical example:
 
 @cindex redirection to random servers
 When you connect to the Freenode network
-(@indicateurl{http://freenode.net/}), you point your IRC client at the
+(@code{http://freenode.net/}), you point your IRC client at the
 server @code{irc.freenode.net}.  That server will redirect your client
 to a random server on the network, such as @code{zelazny.freenode.net}.
 
@@ -424,8 +424,8 @@ your status as ``being back'' if you do not.  People can use the
 @cindex help about irc
 Typical IRC servers implement many more commands.  You can read more
 about the fantastic world of IRC online at
-@indicateurl{http://www.irchelp.org/}, the Internet Relay Chat (IRC)
-help archive.
+@uref{http://www.irchelp.org/, the Internet Relay Chat (IRC) help
+archive}.
 
 @node Configuration, , Useful IRC commands, Reference
 @section Configuration
diff --git a/man/tramp.texi b/man/tramp.texi
index e7d7b3d6b8d..b85347461ca 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -1931,12 +1931,16 @@ navigation in the @file{*Compilation*} buffer.
 @chapter Reporting Bugs and Problems
 @cindex bug reports
 
-Bugs and problems with @value{tramp} are actively worked on by the development
-team. Feature requests and suggestions are also more than welcome.
-
-The @value{tramp} mailing list is a great place to get information on working
-with @value{tramp}, solving problems and general discussion and advice on topics
-relating to the package.
+Bugs and problems with @value{tramp} are actively worked on by the
+development team. Feature requests and suggestions are also more than
+welcome.
+
+The @value{tramp} mailing list is a great place to get information on
+working with @value{tramp}, solving problems and general discussion
+and advice on topics relating to the package.  It is moderated so
+non-subscribers can post but messages will be delayed, possibly up to
+48 hours (or longer in case of holidays), until the moderator approves
+your message.
 
 The mailing list is at @email{tramp-devel@@gnu.org}.  Messages sent to
 this address go to all the subscribers. This is @emph{not} the address
diff --git a/man/trampver.texi b/man/trampver.texi
index 4fc3958b2f2..bf220f4b195 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -4,7 +4,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.0.53
+@set trampver 2.0.54
 
 @c Other flags from configuration
 @set prefix /usr/local
diff --git a/man/windows.texi b/man/windows.texi
index a000892ad09..afb9f4273e6 100644
--- a/man/windows.texi
+++ b/man/windows.texi
@@ -116,7 +116,7 @@ fit are frequent.  Continuing all those lines might be confusing, so
 if the variable @code{truncate-partial-width-windows} is
 non-@code{nil}, that forces truncation in all windows less than the
 full width of the screen, independent of the buffer being displayed
-and its value for @code{truncate-lines}.  @xref{Display Custom}.
+and its value for @code{truncate-lines}.  @xref{Line Truncation}.
 
   Horizontal scrolling is often used in side-by-side windows.
 @xref{Horizontal Scrolling}.