summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2011-07-08 16:25:25 +0200
committerMichael Albinus <michael.albinus@gmx.de>2011-07-08 16:25:25 +0200
commitafae1d6821cbc2bf97c27fe99ec75ca9d40fd458 (patch)
tree25387ca14938184636bc85839d00205dadad15b2 /lisp
parent0757af948b8d55d29395fa8c57ea8e72a0369e66 (diff)
downloademacs-afae1d6821cbc2bf97c27fe99ec75ca9d40fd458.tar.gz
* net/tramp-sh.el (tramp-sh-handle-start-file-process): Use a
human-friendly prompt.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el7
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e517d6cc54d..0c912db74d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-08 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-sh-handle-start-file-process): Use a
+ human-friendly prompt.
+
2011-07-08 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc-bzr.el (vc-bzr-revision-keywords): Remove svn, it's only
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index f342b005c4c..1c6f0844be0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2690,8 +2690,13 @@ the result will be a local, non-Tramp, filename."
;; When PROGRAM is nil, we just provide a tty.
(let ((command
(when (stringp program)
- (format "cd %s; exec %s"
+ (format "cd %s; exec env PS1=%s %s"
(tramp-shell-quote-argument localname)
+ ;; Use a human-friendly prompt, for example for `shell'.
+ (tramp-shell-quote-argument
+ (format "%s %s"
+ (file-remote-p default-directory)
+ tramp-initial-end-of-output))
(mapconcat 'tramp-shell-quote-argument
(cons program args) " "))))
(tramp-process-connection-type