From: Michael Albinus Date: Sun, 3 Apr 2016 07:37:16 +0000 (+0200) Subject: Handle Bug#23186 X-Git-Tag: emacs-25.0.93~73 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06ae23aa1202e547e65ff9f77882de4dd7f1c591;p=emacs.git Handle Bug#23186 * lisp/net/tramp.el (tramp-encoding-command-switch) (tramp-encoding-command-interactive): * lisp/net/tramp-sh.el (tramp-maybe-open-connection): `tramp-encoding-shell' could be nil. (Bug#23186) --- diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index aa0ac022f03..79ff1bea4c2 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4875,6 +4875,8 @@ connection if a previous connection has died for some reason." (setenv "HISTSIZE" "0")))) (setenv "PROMPT_COMMAND") (setenv "PS1" tramp-initial-end-of-output) + (unless (stringp tramp-encoding-shell) + (tramp-error vec 'file-error "`tramp-encoding-shell' not set")) (let* ((target-alist (tramp-compute-multi-hops vec)) ;; We will apply `tramp-ssh-controlmaster-options' ;; only for the first hop. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 19dced6c2f3..26672d1fabb 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -180,7 +180,7 @@ use for the remote host." :type '(file :must-match t)) (defcustom tramp-encoding-command-switch - (if (string-match "cmd\\.exe" tramp-encoding-shell) + (if (string-match "cmd\\.exe" (or tramp-encoding-shell "")) "/c" "-c") "Use this switch together with `tramp-encoding-shell' for local commands. @@ -189,7 +189,7 @@ See the variable `tramp-encoding-shell' for more information." :type 'string) (defcustom tramp-encoding-command-interactive - (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i") + (unless (string-match "cmd\\.exe" (or tramp-encoding-shell "")) "-i") "Use this switch together with `tramp-encoding-shell' for interactive shells. See the variable `tramp-encoding-shell' for more information." :version "24.1"