1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 19:00:55 -08:00

Fix Bug#23614.

* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
Let-bind `process-coding-system-alist' in order to suppress
the value for "cmdproxy".

* lisp/net/tramp.el (tramp-encoding-shell):
`w32-shell-name' is a function.
(tramp-encoding-command-switch)
(tramp-encoding-command-interactive): Use `w32-shell-dos-semantics'.

* test/lisp/net/tramp-tests.el (tramp-test24-file-name-completion):
Suppress some tests on MS Windows.  (Bug#23614)
This commit is contained in:
Michael Albinus 2016-05-26 19:57:13 +02:00
parent 16be3e9054
commit 21e87ece97
3 changed files with 11 additions and 7 deletions

View file

@ -4790,6 +4790,9 @@ connection if a previous connection has died for some reason."
(options (tramp-ssh-controlmaster-options vec)) (options (tramp-ssh-controlmaster-options vec))
(process-connection-type tramp-process-connection-type) (process-connection-type tramp-process-connection-type)
(process-adaptive-read-buffering nil) (process-adaptive-read-buffering nil)
;; There are unfortune settings for "cmdproxy" on
;; W32 systems.
(process-coding-system-alist nil)
(coding-system-for-read nil) (coding-system-for-read nil)
;; This must be done in order to avoid our file ;; This must be done in order to avoid our file
;; name handler. ;; name handler.

View file

@ -120,9 +120,7 @@ This setting has precedence over `auto-save-file-name-transforms'."
(directory :tag "Auto save directory name"))) (directory :tag "Auto save directory name")))
(defcustom tramp-encoding-shell (defcustom tramp-encoding-shell
(if (boundp 'w32-shell-name) (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh")
(symbol-value 'w32-shell-name)
"/bin/sh")
"Use this program for encoding and decoding commands on the local host. "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 This shell is used to execute the encoding and decoding command on the
local host, so if you want to use `~' in those commands, you should local host, so if you want to use `~' in those commands, you should
@ -145,14 +143,15 @@ use for the remote host."
:group 'tramp :group 'tramp
:type '(file :must-match t)) :type '(file :must-match t))
(defcustom tramp-encoding-command-switch (if (boundp 'w32-shell-name) "/c" "-c") (defcustom tramp-encoding-command-switch
(if (tramp-compat-funcall 'w32-shell-dos-semantics) "/c" "-c")
"Use this switch together with `tramp-encoding-shell' for local commands. "Use this switch together with `tramp-encoding-shell' for local commands.
See the variable `tramp-encoding-shell' for more information." See the variable `tramp-encoding-shell' for more information."
:group 'tramp :group 'tramp
:type 'string) :type 'string)
(defcustom tramp-encoding-command-interactive (defcustom tramp-encoding-command-interactive
(unless (boundp 'w32-shell-name) "-i") (unless (tramp-compat-funcall 'w32-shell-dos-semantics) "-i")
"Use this switch together with `tramp-encoding-shell' for interactive shells. "Use this switch together with `tramp-encoding-shell' for interactive shells.
See the variable `tramp-encoding-shell' for more information." See the variable `tramp-encoding-shell' for more information."
:version "24.1" :version "24.1"

View file

@ -1380,8 +1380,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(unwind-protect (unwind-protect
(progn (progn
;; Method and host name in completion mode. ;; Method and host name in completion mode. This kind of
(when (tramp-completion-mode-p) ;; completion does not work on MS Windows.
(when (and (tramp-completion-mode-p)
(not (memq system-type '(cygwin windows-nt))))
(unless (zerop (length method)) (unless (zerop (length method))
(should (should
(member (member