summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-sh.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2016-05-26 19:57:13 +0200
committerMichael Albinus <michael.albinus@gmx.de>2016-05-26 19:57:13 +0200
commit21e87ece97e90f5500bd49b84dca08d97bd4f155 (patch)
treef67c6de3371321e0ad80f0e0ef12ef5094de2407 /lisp/net/tramp-sh.el
parent16be3e90545972dec16014253a843229d5bdf388 (diff)
downloademacs-21e87ece97e90f5500bd49b84dca08d97bd4f155.tar.gz
emacs-21e87ece97e90f5500bd49b84dca08d97bd4f155.tar.bz2
emacs-21e87ece97e90f5500bd49b84dca08d97bd4f155.zip
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)
Diffstat (limited to 'lisp/net/tramp-sh.el')
-rw-r--r--lisp/net/tramp-sh.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 3fb15888ca8..14c6f949853 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4790,6 +4790,9 @@ connection if a previous connection has died for some reason."
(options (tramp-ssh-controlmaster-options vec))
(process-connection-type tramp-process-connection-type)
(process-adaptive-read-buffering nil)
+ ;; There are unfortune settings for "cmdproxy" on
+ ;; W32 systems.
+ (process-coding-system-alist nil)
(coding-system-for-read nil)
;; This must be done in order to avoid our file
;; name handler.