Commit 36b148cf authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp.el (tramp-encoding-command-interactive): New defcustom.

* net/tramp-sh.el (tramp-maybe-open-connection): Use it.
parent f3078a00
2011-07-01 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-encoding-command-interactive): New defcustom.
* net/tramp-sh.el (tramp-maybe-open-connection): Use it.
2011-07-01 Martin Rudalics <rudalics@gmx.at>
* window.el (same-window-buffer-names, same-window-regexps)
......
......@@ -4291,10 +4291,14 @@ connection if a previous connection has died for some reason."
;; This must be done in order to avoid our file name handler.
(p (let ((default-directory
(tramp-compat-temporary-file-directory)))
(start-process
(apply
'start-process
(tramp-get-connection-name vec)
(tramp-get-connection-buffer vec)
tramp-encoding-shell))))
(if tramp-encoding-command-interactive
(list tramp-encoding-shell
tramp-encoding-command-interactive)
(list tramp-encoding-shell))))))
(tramp-message
vec 6 "%s" (mapconcat 'identity (process-command p) " "))
......
......@@ -159,6 +159,9 @@ For encoding and deocding, commands like the following are executed:
This variable can be used to change the \"/bin/sh\" part. See the
variable `tramp-encoding-command-switch' for the \"-c\" part.
If the shell must be forced to be interactive, see
`tramp-encoding-command-interactive'.
Note that this variable is not used for remote commands. There are
mechanisms in tramp.el which automatically determine the right shell to
use for the remote host."
......@@ -174,6 +177,13 @@ See the variable `tramp-encoding-shell' for more information."
:group 'tramp
:type 'string)
(defcustom tramp-encoding-command-interactive
(unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i")
"*Use this switch together with `tramp-encoding-shell' for interactive shells.
See the variable `tramp-encoding-shell' for more information."
:group 'tramp
:type '(choice (const nil) string))
;;;###tramp-autoload
(defvar tramp-methods nil
"*Alist of methods for remote files.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment