[Emacs-diffs] master 7575ba2: Fix Bug#23186

[Michael Albinus]

branch: master
commit 7575ba254c884c89a3ed9b1b2c2bd73c079d98ee
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Fix 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)
---
 lisp/net/tramp-sh.el |    2 ++
 lisp/net/tramp.el    |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index dbaa73f..2667aaf 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4783,6 +4783,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 f03ec55..fc194fa 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -146,7 +146,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.
@@ -155,7 +155,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"