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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

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

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS

15 files changed, 145 insertions, 99 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index eace76aae1a..3d1dfccff15 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,50 @@
+2006-01-23  Juri Linkov  <juri@jurta.org>
+
+        * custom.texi (Easy Customization, Customization Groups)
+        (Browsing Custom): Mention links along with buttons.
+
+        * widget.texi (User Interface): Add S-TAB for widget-backward.
+
+2006-01-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.52.
+
+        * tramp.texi (Frequently Asked Questions): Remove Ange-FTP item.
+        Add Tramp disabling item.  New item for common connection
+        problems.
+        (various): Apply "ftp" as method for the download URL.
+        (Bug Reports): Refer to FAQ for common problems.
+
+2006-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * widget.texi (User Interface): Use @key for TAB.
+
+        * text.texi (TeX Print): Use @key for TAB.
+
+        * ses.texi (Formulas, Printer functions): Use @key for TAB.
+
+        * kmacro.texi (Keyboard Macro Step-Edit): : Use @key for TAB.
+
+        * ebrowse.texi (Switching to Tree, Symbol Completion): : Use @key
+        for TAB.
+
+        * cc-mode.texi (Indentation Calculation): Use @key for TAB.
+
+2006-01-15  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
+
+        * files.texi (File Aliases): Don't claim that usually separate
+        buffers are created for two file names that name the same data.
+        Mention additional situations where different names mean the same
+        file on disk.
+
+2006-01-19  Richard M. Stallman  <rms@gnu.org>
+
+        * killing.texi (Deletion): Upcase @key argument.
+
+        * custom.texi (Custom Themes): Minor cleanup.
+
+        * programs.texi (Hungry Delete): Upcase @key argument.
+
 2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi: Update copyright.
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 0d6e88f20ea..05c4cbf5a3c 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -208,7 +208,7 @@ license to the document, as described in section 6 of the license.
 @vskip 0pt plus 1filll
 @insertcopying
 
-This manual was generated from $Revision: 1.32 $ of $RCSfile: cc-mode.texi,v $, which can be
+This manual was generated from $Revision$ of $RCSfile$, which can be
 downloaded from
 @url{http://cvs.sf.net/viewcvs.py/cc-mode/cc-mode/cc-mode.texi}.
 @end titlepage
@@ -4883,7 +4883,7 @@ our first example again:
  6: @}
 @end example
 
-Let's say point is on line 3 and we hit the @kbd{TAB} key to reindent
+Let's say point is on line 3 and we hit the @key{TAB} key to reindent
 the line.  The syntactic context for that line is:
 
 @example
diff --git a/man/custom.texi b/man/custom.texi
index 9b93b56a08f..509a63a4de2 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -202,7 +202,7 @@ and set their values, and to save settings permanently in your
 
   The appearance of the example buffers in this section is typically
 different under a window system, since faces are then used to indicate
-buttons and editable fields.
+buttons, links and editable fields.
 
 @menu
 * Groups: Customization Groups.   How settings are classified in a structure.
@@ -256,16 +256,18 @@ line.
 
 @cindex editable fields (customization buffer)
 @cindex buttons (customization buffer)
+@cindex links (customization buffer)
   Most of the text in the customization buffer is read-only, but it
 typically includes some @dfn{editable fields} that you can edit.
-There are also @dfn{buttons}, which do something when you @dfn{invoke}
-them.  To invoke a button, either click on it with @kbd{Mouse-1}, or
-move point to it and type @key{RET}.
+There are also @dfn{buttons} and @dfn{links}, which do something when
+you @dfn{invoke} them.  To invoke a button or a link, either click on
+it with @kbd{Mouse-1}, or move point to it and type @key{RET}.
 
-  For example, the phrase @samp{[Go to Group]} that appears in a
-second-level group is a button.  Invoking it creates a new
-customization buffer, which shows that group and its contents.  This
-is a kind of hypertext link to another group.
+  For example, the phrase @samp{[State]} that appears in
+a second-level group is a button.  It operates on the same
+customization buffer.  The phrase @samp{[Go to Group]} is a kind
+of hypertext link to another group.  Invoking it creates a new
+customization buffer, which shows that group and its contents.
 
   The @code{Emacs} group includes a few settings, but mainly it
 contains other groups, which contain more groups, which contain the
@@ -288,8 +290,8 @@ structure.
 @samp{[+]}.  When the group contents are visible, this button changes to
 @samp{[-]}; invoking that hides the group contents.
 
-  Each setting in this buffer has a button which says @samp{[Group]},
-@samp{[Option]} or @samp{[Face]}.  Invoking this button creates an
+  Each setting in this buffer has a link which says @samp{[Group]},
+@samp{[Option]} or @samp{[Face]}.  Invoking this link creates an
 ordinary customization buffer showing just that group and its
 contents, just that user option, or just that face.  This is the way
 to change settings that you find with @kbd{M-x customize-browse}.
@@ -729,14 +731,15 @@ theme occurring earlier in @code{custom-enabled-themes} takes effect.
 @findex load-theme
 @findex enable-theme
 @findex disable-theme
-  You can also enable a Custom theme with @kbd{M-x enable-theme}.
-This prompts for a theme name in the minibuffer, loads the theme from
-the theme file if necessary, and enables the theme.  An enabled theme
-can be @dfn{disabled} with the command @kbd{M-x disable-theme}; this
-returns the options specified in the theme to their original values.
-To re-enable the theme, call @kbd{M-x enable-theme} again.  If a theme
-file is changed during your Emacs session, you can reload it by
-calling @kbd{M-x load-theme}.  This also enables the theme.
+  You can temporarily enable a Custom theme with @kbd{M-x
+enable-theme}.  This prompts for a theme name in the minibuffer, loads
+the theme from the theme file if necessary, and enables the theme.
+You can @dfn{disabled} any enabled theme with the command @kbd{M-x
+disable-theme}; this returns the options specified in the theme to
+their original values.  To re-enable the theme, type @kbd{M-x
+enable-theme} again.  If a theme file is changed during your Emacs
+session, you can reload it by typing @kbd{M-x load-theme}.  (This also
+enables the theme.)
 
 @node Variables
 @section Variables
diff --git a/man/ebrowse.texi b/man/ebrowse.texi
index b48d5c2b987..77e4ad07b45 100644
--- a/man/ebrowse.texi
+++ b/man/ebrowse.texi
@@ -979,11 +979,11 @@ a mouse.
 @cindex switching buffers
 
 @table @kbd
-@item TAB
+@item @key{TAB}
 Pop up the tree buffer to which the member buffer belongs.
 
 @item t
-Do the same as @kbd{TAB} but also position the cursor on the class
+Do the same as @key{TAB} but also position the cursor on the class
 displayed in the member buffer.
 @end table
 
@@ -1433,7 +1433,7 @@ command @kbd{C-c b f}, for example, to jump to a specific member.
 @cindex completion
 @cindex symbol completion
 
-The command @kbd{C-c b TAB} completes the symbol in front of point.
+The command @kbd{C-c b @key{TAB}} completes the symbol in front of point.
 
 
 
diff --git a/man/files.texi b/man/files.texi
index d599e576e94..7b08fc5c791 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1150,21 +1150,20 @@ either name to refer to the file, but @file{bar} is the real name, while
 @file{foo} is just an alias.  More complex cases occur when symbolic
 links point to directories.
 
-  If you visit two names for the same file, normally Emacs makes
-two different buffers, but it warns you about the situation.
-
 @vindex find-file-existing-other-name
 @vindex find-file-suppress-same-file-warnings
+
   Normally, if you visit a file which Emacs is already visiting under
 a different name, Emacs displays a message in the echo area and uses
 the existing buffer visiting that file.  This can happen on systems
-that support symbolic links, or if you use a long file name on a
-system that truncates long file names.  You can suppress the message by
-setting the variable @code{find-file-suppress-same-file-warnings} to a
-non-@code{nil} value.  You can disable this feature entirely by setting
-the variable @code{find-file-existing-other-name} to @code{nil}: then
-if you visit the same file under two different names, you get a separate
-buffer for each file name.
+that support hard or symbolic links, or if you use a long file name on
+a system that truncates long file names, or on a case-insensitive file
+system.  You can suppress the message by setting the variable
+@code{find-file-suppress-same-file-warnings} to a non-@code{nil}
+value.  You can disable this feature entirely by setting the variable
+@code{find-file-existing-other-name} to @code{nil}: then if you visit
+the same file under two different names, you get a separate buffer for
+each file name.
 
 @vindex find-file-visit-truename
 @cindex truenames of files
diff --git a/man/killing.texi b/man/killing.texi
index 738043cd61b..9ee6e7e62e3 100644
--- a/man/killing.texi
+++ b/man/killing.texi
@@ -78,9 +78,9 @@ erase just one character or only whitespace.
 
 @table @kbd
 @item C-d
-@itemx @key{Delete}
+@itemx @key{DELETE}
 Delete next character (@code{delete-char}).  If your keyboard has a
-@key{Delete} function key (usually located in the edit keypad), Emacs
+@key{DELETE} function key (usually located in the edit keypad), Emacs
 binds it to @code{delete-char} as well.
 @item @key{DEL}
 @itemx @key{BS}
diff --git a/man/kmacro.texi b/man/kmacro.texi
index 0693eefca54..852f999adac 100644
--- a/man/kmacro.texi
+++ b/man/kmacro.texi
@@ -521,8 +521,8 @@ next command in the keyboard macro.
 @kbd{f} skips the current command in this execution of the keyboard
 macro, but doesn't delete it from the macro.
 @item
-@kbd{TAB} executes the current command, as well as all similar
-commands immediately following the current command; for example, TAB
+@kbd{@key{TAB}} executes the current command, as well as all similar
+commands immediately following the current command; for example, @key{TAB}
 may be used to insert a sequence of characters (corresponding to a
 sequence of @code{self-insert-command} commands).
 @item
diff --git a/man/org.texi b/man/org.texi
index c73235f3df1..cf096504f40 100644
--- a/man/org.texi
+++ b/man/org.texi
@@ -4,7 +4,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.03
+@set VERSION 4.04
 @set DATE January 2006
 
 @dircategory Emacs
@@ -2511,7 +2511,7 @@ original org file.
 
 @kindex T
 @item T
-Show all tags associated with the current item.  Because of
+Show all tags assiciated with the current item.  Because of
 inheritance, this may be more than the tags listed in the line itself.
 
 @kindex :
diff --git a/man/programs.texi b/man/programs.texi
index e1806488150..dfb1e9c0d85 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -1630,7 +1630,7 @@ following point.
 delete mode}.  When this feature is enabled (indicated by @samp{/h} in
 the mode line after the mode name), a single @key{BS} command deletes
 all preceding whitespace, not just one space, and a single @kbd{C-c
-C-d} (but @emph{not} @key{delete}) deletes all following whitespace.
+C-d} (but @emph{not} @key{DELETE}) deletes all following whitespace.
 
 @table @kbd
 @item M-x c-toggle-hungry-state
diff --git a/man/ses.texi b/man/ses.texi
index f6977335661..38caa7c830a 100644
--- a/man/ses.texi
+++ b/man/ses.texi
@@ -188,12 +188,12 @@ Self-insert an expression.  The right-parenthesis is inserted for you
 (@code{ses-read-cell}).  To access another cell's value, just use its
 identifier in your expression.  Whenever the other cell is changed,
 this cell's formula will be reevaluated.  While typing in the
-expression, you can use @kbd{M-TAB} to complete symbol names.
+expression, you can use @kbd{M-@key{TAB}} to complete symbol names.
 
 @item ' @r{(apostrophe)}
 Enter a symbol (ses-read-symbol).  SES remembers all symbols that have
 been used as formulas, so you can type just the beginning of a symbol
-and use @kbd{SPC}, @kbd{TAB}, and @kbd{?} to complete it.
+and use @kbd{@key{SPC}}, @kbd{@key{TAB}}, and @kbd{?} to complete it.
 @end table
 
 To enter something else (e.g., a vector), begin with a digit, then
@@ -287,7 +287,7 @@ string is right-aligned within the print cell.  To get left-alignment,
 use parentheses: @samp{("$%.2f")}.  A printer can also be a
 one-argument function (a symbol or a lambda), whose result is a string
 (right-aligned) or list of one string (left-aligned).  While typing in
-a lambda, you can use @kbd{M-TAB} to complete the names of symbols.
+a lambda, you can use @kbd{M-@key{TAB}} to complete the names of symbols.
 
 Each cell has a printer.  If @code{nil}, the column-printer for the cell's
 column is used.  If that is also @code{nil}, the default-printer for the
diff --git a/man/text.texi b/man/text.texi
index 5abb736a891..4470e494daf 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -1680,12 +1680,12 @@ Variables}.
   For La@TeX{} files, you can use Bib@TeX{} to process the auxiliary
 file for the current buffer's file.  Bib@TeX{} looks up bibliographic
 citations in a data base and prepares the cited references for the
-bibliography section.  The command @kbd{C-c TAB}
+bibliography section.  The command @kbd{C-c @key{TAB}}
 (@code{tex-bibtex-file}) runs the shell command
 (@code{tex-bibtex-command}) to produce a @samp{.bbl} file for the
 current buffer's file.  Generally, you need to do @kbd{C-c C-f}
 (@code{tex-file}) once to generate the @samp{.aux} file, then do
-@kbd{C-c TAB} (@code{tex-bibtex-file}), and then repeat @kbd{C-c C-f}
+@kbd{C-c @key{TAB}} (@code{tex-bibtex-file}), and then repeat @kbd{C-c C-f}
 (@code{tex-file}) twice more to get the cross-references correct.
 
 @findex tex-compile
diff --git a/man/tramp.texi b/man/tramp.texi
index ccaa0cd3c61..89773534096 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -25,8 +25,8 @@
 @end macro
 
 @copying
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -111,7 +111,7 @@ Japanese translation}.
 @end ifset
 
 The latest release of @value{tramp} is available for
-@uref{http://ftp.gnu.org/gnu/tramp/, download}, or you may see
+@uref{ftp://ftp.gnu.org/gnu/tramp/, download}, or you may see
 @ref{Obtaining Tramp} for more details, including the CVS server
 details.
 
@@ -378,7 +378,7 @@ behind the scenes when you open a file with @value{tramp}.
 
 @value{tramp} is freely available on the Internet and the latest
 release may be downloaded from
-@uref{http://ftp.gnu.org/gnu/tramp/}. This release includes the full
+@uref{ftp://ftp.gnu.org/gnu/tramp/}. This release includes the full
 documentation and code for @value{tramp}, suitable for installation.
 But GNU Emacs (22 or later) includes @value{tramp} already, and there
 is a @value{tramp} package for XEmacs, as well.  So maybe it is easier
@@ -1946,7 +1946,9 @@ will automatically generate a buffer with the details of your system and
 
 When submitting a bug report, please try to describe in excruciating
 detail the steps required to reproduce the problem, the setup of the
-remote machine and any special conditions that exist.
+remote machine and any special conditions that exist.  You should also
+check that your problem is not described already in @xref{Frequently
+Asked Questions}.
 
 If you can identify a minimal test case that reproduces the problem,
 include that with your bug report. This will make it much easier for the
@@ -1964,7 +1966,7 @@ Where can I get the latest @value{tramp}?
 @value{tramp} is available under the URL below.
 
 @noindent
-@uref{http://ftp.gnu.org/gnu/tramp/}
+@uref{ftp://ftp.gnu.org/gnu/tramp/}
 
 @noindent
 There is also a Savannah project page.
@@ -1972,6 +1974,7 @@ There is also a Savannah project page.
 @noindent
 @uref{http://savannah.gnu.org/projects/tramp/}
 
+
 @item
 Which systems does it work on?
 
@@ -2003,49 +2006,32 @@ Emacs?  I think there was some issue with @command{ssh}?
 
 
 @item
-I can't stop @value{ftppackagename} starting with @value{emacsname}
+@value{tramp} does not connect to the remote host
 
-@ifset emacs
-@value{ftppackagename} is loaded from @value{tramp} automatically if you
-require a file by the ftp method.  Unfortunately, there are some Lisp
-packages which make @value{ftppackagename} file name handlers active.
-You can see it applying @kbd{C-h v file-name-handler-alist}:
+When @value{tramp} does not connect to the remote host, there are two
+reasons heading the bug mailing list:
 
-@example
-file-name-handler-alist's value is
-(("^/[^/:]*\\'" . ange-ftp-completion-hook-function)
- ("^/[^/:]*[^/:.]:" . ange-ftp-hook-function)
- ("^/[^/]*$" . tramp-completion-file-name-handler)
- ("\\`/[^/:]+:" . tramp-file-name-handler)
- ("\\`/:" . file-name-non-special))
-@end example
+@itemize @minus
 
-Please try to find out which package is responsible for loading
-@value{ftppackagename}, and raise a bug report.
+@item
+Unknown characters in the prompt
 
-A workaround is to require @value{ftppackagename} before @value{tramp} in
-your @file{~/.emacs}, because @value{tramp} cleans up the entries in
-@code{file-name-handler-alist}:
+@value{tramp} needs to recognize the prompt on the remote machine
+after execution any command.  This is not possible, when the prompt
+contains unknown characters like escape sequences for coloring.  This
+should be avoided on the remote side.  @xref{Remote shell setup}. for
+setting the regular expression detecting the prompt.
 
-@lisp
-;; @value{ftppackagename} temporarily required
-(require 'ange-ftp)
-;; @value{tramp} cleans up @code{file-name-handler-alist}
-(require 'tramp)
-@end lisp
-@end ifset
+@item
+@value{tramp} doesn't transfer strings with more than 500 characters
+correctly
 
-@ifset xemacs
-Not all the older versions of @value{tramp} supported @value{emacsname}
-correctly.  The first thing to do is to make sure that you have the
-latest version of @value{tramp} installed.
-
-If you do, please try and find out exactly the conditions required for
-the @value{ftppackagename} handlers to fire.  If you can, putting a
-breakpoint on @code{efs-ftp-path} and sending in the stack trace along
-with your bug report would make it easier for the developers to work out
-what is going wrong.
-@end ifset
+On some few systems, the implementation of @code{process-send-string}
+seems to be broken for longer strings.  This case, you should
+customize the variable @code{tramp-chunksize} to 500.  For a
+description how to determine whether this is necessary see the
+documentation of @code{tramp-chunksize}.
+@end itemize
 
 
 @item
@@ -2132,14 +2118,24 @@ fi
 
 
 @item
-@value{tramp} doesn't transfer strings with more than 500 characters
-correctly
+How can I disable @value{tramp}?
 
-On some few systems, the implementation of @code{process-send-string}
-seems to be broken for longer strings.  This case, you should
-customize the variable @code{tramp-chunksize} to 500.  For a
-description how to determine whether this is necessary see the
-documentation of @code{tramp-chunksize}.
+Shame on you, why did you read until now?
+
+@ifset emacs
+If you just want to have @value{ftppackagename} as default remote
+files access package, you should apply the following code:
+
+@lisp
+(setq tramp-default-method "ftp")
+@end lisp
+@end ifset
+
+Unloading @value{tramp} can be achieved by applying @kbd{M-x
+tramp-unload-tramp}.
+@ifset emacs
+This resets also the @value{ftppackagename} plugins.
+@end ifset
 @end itemize
 
 
diff --git a/man/trampver.texi b/man/trampver.texi
index 9f2bb8737f7..625e3869c11 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.51
+@set trampver 2.0.52
 
 @c Other flags from configuration
 @set prefix /usr/local
diff --git a/man/vip.texi b/man/vip.texi
index e98d51aeca1..96d04ef0913 100644
--- a/man/vip.texi
+++ b/man/vip.texi
@@ -1568,7 +1568,7 @@ keymap.  See GNU Emacs Manual for details.
 @kindex 000 @kbd{C-@@} (@code{set-mark-command})
 Set mark and push previous mark on mark ring (@code{set-mark-command}).
 @item TAB
-@kindex 011 @kbd{TAB} (@code{indent-for-tab-command})
+@kindex 011 TAB (@code{indent-for-tab-command})
 Indent line for current major mode (@code{indent-for-tab-command}).
 @item C-j
 @kindex 012 @kbd{C-j} (@code{newline-and-indent})
diff --git a/man/widget.texi b/man/widget.texi
index 91e74dca01c..cf10e5980b7 100644
--- a/man/widget.texi
+++ b/man/widget.texi
@@ -140,7 +140,7 @@ extended to use the GUI features.  This means that your code using the
 widget library will also use the new graphic features automatically.
 @end enumerate
 
-In order to minimize the code that is loaded by users who does not
+In order to minimize the code that is loaded by users who do not
 create any widgets, the code has been split in two files:
 
 @cindex widget library, files
@@ -315,7 +315,8 @@ buffer, plus you will have these additional commands:
 @deffn Command widget-forward &optional count
 Move point @var{count} buttons or editing fields forward.
 @end deffn
-@item @key{M-TAB}
+@item @kbd{M-@key{TAB}}
+@itemx @kbd{S-@key{TAB}}
 @deffn Command widget-backward &optional count
 Move point @var{count} buttons or editing fields backward.
 @end deffn