diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-05-26 19:57:13 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-05-26 19:57:13 +0200 |
| commit | 21e87ece97e90f5500bd49b84dca08d97bd4f155 (patch) | |
| tree | f67c6de3371321e0ad80f0e0ef12ef5094de2407 /test/lisp/net/tramp-tests.el | |
| parent | 16be3e90545972dec16014253a843229d5bdf388 (diff) | |
| download | emacs-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 'test/lisp/net/tramp-tests.el')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 6553421c5bc..468ed4a36ff 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1380,8 +1380,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (unwind-protect (progn - ;; Method and host name in completion mode. - (when (tramp-completion-mode-p) + ;; Method and host name in completion mode. This kind of + ;; completion does not work on MS Windows. + (when (and (tramp-completion-mode-p) + (not (memq system-type '(cygwin windows-nt)))) (unless (zerop (length method)) (should (member |