Sync with Tramp 2.0.56.

3 files changed, 13 insertions, 2 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index f9459bfcc2d..98faf2482b1 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.56.
+
+        * tramp.texi (Frequently Asked Questions): Improve ~/.zshrc
+        settings.  Reported by Ted Zlatanov <tzz@lifelogs.com>.
+
 2007-06-07  Alan Mackenzie  <acm@muc.de>
 
         * display.texi (Optional Mode Line): Document the new form of
diff --git a/man/tramp.texi b/man/tramp.texi
index 7acef2663e4..67b0647787c 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -2051,7 +2051,11 @@ setting the regular expression detecting the prompt.
 A special problem is the zsh, which uses left-hand side and right-hand
 side prompts in parallel.  Therefore, it is necessary to disable the
 zsh line editor on the remote host.  You shall add to @file{~/.zshrc}
-the following command: @command{[ $TERM = "dumb" ] && unsetopt zle}.
+the following command:
+
+@example
+[ $TERM = "dumb" ] && unsetopt zle && PS1='$ '
+@end example
 
 @item
 @value{tramp} doesn't transfer strings with more than 500 characters
diff --git a/man/trampver.texi b/man/trampver.texi
index c512de4c74b..6c770dc8ad1 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -9,7 +9,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.55
+@set trampver 2.0.56
 
 @c Other flags from configuration
 @set prefix /usr/local