[Emacs-diffs] /srv/bzr/emacs/trunk r102244: * tramp.texi (Remote shell setup): New item "Interactive shell

[Michael Albinus]

------------------------------------------------------------
revno: 102244
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-04 14:30:20 +0100
message:
  * tramp.texi (Remote shell setup): New item "Interactive shell
  prompt".  Reported by Christian Millour <address@hidden>.
  (Remote shell setup, Remote processes): Use @code{} for
  environment variables.
modified:
  doc/misc/ChangeLog
  doc/misc/tramp.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-11-03 03:53:12 +0000
+++ b/doc/misc/ChangeLog        2010-11-04 13:30:20 +0000
@@ -1,3 +1,10 @@
+2010-11-04  Michael Albinus  <address@hidden>
+
+       * tramp.texi (Remote shell setup): New item "Interactive shell
+       prompt".  Reported by Christian Millour <address@hidden>.
+       (Remote shell setup, Remote processes): Use @code{} for
+       environment variables.
+
 2010-11-03  Glenn Morris  <address@hidden>
 
        * ediff.texi (Quick Help Commands, Miscellaneous):

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2010-10-03 15:09:11 +0000
+++ b/doc/misc/tramp.texi       2010-11-04 13:30:20 +0000
@@ -1942,7 +1942,7 @@
 this line.
 
 Another example is the tilde (@code{~}) character, say when adding
address@hidden/bin} to @code{$PATH}.  Many Bourne shells will not expand this
address@hidden/bin} to @code{PATH}.  Many Bourne shells will not expand this
 character, and since there is usually no directory whose name consists
 of the single character tilde, strange things will happen.
 
@@ -1969,6 +1969,38 @@
 @command{exec /bin/sh} step.  But how to find out if the shell is
 Bourne-ish?
 
+
address@hidden Interactive shell prompt
+
address@hidden redefines the shell prompt in order to parse the shell's
+output robustly.  When calling an interactive shell by @kbd{M-x
+shell}, this doesn't look nice.
+
+You can redefine the shell prompt by checking the environment variable
address@hidden, which is set by @value{tramp}, in your startup
+script @file{~/.emacs_SHELLNAME}. @code{SHELLNAME} might be the string
address@hidden or similar, in case of doubt you could set it the
+environment variable @code{ESHELL} in your @file{.emacs}:
+
address@hidden
+(setenv "ESHELL" "bash")
address@hidden lisp
+
+Your file @file{~/.emacs_SHELLNAME} could contain code like
+
address@hidden
+# Reset the prompt for remote Tramp shells.
+if [ "address@hidden/*tramp*/address@hidden" == "tramp" ] ; then
+   PS1="[\u@@\h \w]$ "
+fi
address@hidden example
+
address@hidden
address@hidden emacs
address@hidden Shell, , , @value{emacsdir}}.
address@hidden ifset
address@hidden ifinfo
+
 @end table
 
 
@@ -2493,7 +2525,7 @@
 Changing or removing an existing entry is not encouraged.  The default
 values are chosen for proper @value{tramp} work.  Nevertheless, if for
 example a paranoid system administrator disallows changing the
address@hidden environment variable, you can customize
address@hidden environment variable, you can customize
 @code{tramp-remote-process-environment}, or you can apply the
 following code in your @file{.emacs}:
 
@@ -2512,7 +2544,7 @@
 
 If you want to run a remote program, which shall connect the X11
 server you are using with your local host, you can set the
address@hidden environment variable on the remote host:
address@hidden environment variable on the remote host:
 
 @lisp
 (add-to-list 'tramp-remote-process-environment