[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116289: * net/tramp-sh.el (tramp-sh-handle-start-fi
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r116289: * net/tramp-sh.el (tramp-sh-handle-start-file-process): Use "&&" |
Date: |
Thu, 06 Feb 2014 08:49:38 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116289
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-06 09:49:34 +0100
message:
* net/tramp-sh.el (tramp-sh-handle-start-file-process): Use "&&"
instead of ";" in order to avoid additional prompts. Let heredoc
scripts read from tty. (Bug#16582)
(tramp-send-command): No special handling of heredocs, it isn't
necessary anymore.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-02-06 05:37:23 +0000
+++ b/lisp/ChangeLog 2014-02-06 08:49:34 +0000
@@ -1,3 +1,11 @@
+2014-02-06 Michael Albinus <address@hidden>
+
+ * net/tramp-sh.el (tramp-sh-handle-start-file-process): Use "&&"
+ instead of ";" in order to avoid additional prompts. Let heredoc
+ scripts read from tty. (Bug#16582)
+ (tramp-send-command): No special handling of heredocs, it isn't
+ necessary anymore.
+
2014-02-06 Stefan Monnier <address@hidden>
* emacs-lisp/lisp.el (lisp-completion-at-point): Symbols don't start
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2014-02-05 14:11:50 +0000
+++ b/lisp/net/tramp-sh.el 2014-02-06 08:49:34 +0000
@@ -2711,7 +2711,7 @@
(cdr args)))
(command
(when (stringp program)
- (format "cd %s; exec %s env PS1=%s %s"
+ (format "cd %s && exec %s env PS1=%s %s"
(tramp-shell-quote-argument localname)
(if heredoc (format "<<'%s'" tramp-end-of-heredoc) "")
;; Use a human-friendly prompt, for example for `shell'.
@@ -2720,7 +2720,7 @@
(file-remote-p default-directory)
tramp-initial-end-of-output))
(if heredoc
- (format "%s\n%s\n%s"
+ (format "%s\n(\n%s\n) </dev/tty\n%s"
program (car args) tramp-end-of-heredoc)
(mapconcat 'tramp-shell-quote-argument
(cons program args) " ")))))
@@ -4571,14 +4571,6 @@
;; We mark the command string that it can be erased in the output buffer.
(tramp-set-connection-property p "check-remote-echo" t)
(setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
- ;; Some busyboxes tend to close the connection when we use the
- ;; following syntax for here-documents. This we cannot test; it
- ;; shall be set via `tramp-connection-properties'.
- (when (and (string-match (format "<<'%s'" tramp-end-of-heredoc) command)
- (not (tramp-get-connection-property vec "busybox" nil)))
- ;; Unset $PS1 when using here documents, in order to avoid
- ;; multiple prompts.
- (setq command (concat "(PS1= ; " command "\n)")))
;; Send the command.
(tramp-message vec 6 "%s" command)
(tramp-send-string vec command)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116289: * net/tramp-sh.el (tramp-sh-handle-start-file-process): Use "&&",
Michael Albinus <=