mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-01 02:31:23 -07:00
Code Issues Projects Releases Wiki Activity

Fix Bug#23186, again

Browse source 
* lisp/net/tramp.el (tramp-encoding-shell)
(tramp-encoding-command-switch)
(tramp-encoding-command-interactive): Check for
`w32-shell-name'.  (Bug#23186)
This commit is contained in:
Michael Albinus 2016-04-03 17:54:25 +02:00
parent 7575ba254c
commit 1b33cd8e7e
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/net/tramp.el
View file

@ -120,8 +120,8 @@ This setting has precedence over `auto-save-file-name-transforms'."
(directory :tag "Auto save directory name")))
(defcustom tramp-encoding-shell
(if (memq system-type '(windows-nt))
(getenv "COMSPEC")
(if (boundp 'w32-shell-name)
(symbol-value 'w32-shell-name)
"/bin/sh")
"Use this program for encoding and decoding commands on the local host.
This shell is used to execute the encoding and decoding command on the
@ -145,17 +145,14 @@ use for the remote host."
:group 'tramp
:type '(file :must-match t))
(defcustom tramp-encoding-command-switch
(if (string-match "cmd\\.exe" (or tramp-encoding-shell ""))
"/c"
"-c")
(defcustom tramp-encoding-command-switch (if (boundp 'w32-shell-name) "/c" "-c")
"Use this switch together with `tramp-encoding-shell' for local commands.
See the variable `tramp-encoding-shell' for more information."
:group 'tramp
:type 'string)
(defcustom tramp-encoding-command-interactive
(unless (string-match "cmd\\.exe" (or tramp-encoding-shell "")) "-i")
(unless (boundp 'w32-shell-name) "-i")
"Use this switch together with `tramp-encoding-shell' for interactive shells.
See the variable `tramp-encoding-shell' for more information."
:version "24.1"