emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master e8bcf45: Handle different system names of w32 in Tramp (Bug#38079


From: Michael Albinus
Subject: master e8bcf45: Handle different system names of w32 in Tramp (Bug#38079)
Date: Thu, 7 Nov 2019 12:40:22 -0500 (EST)

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

    Handle different system names of w32 in Tramp (Bug#38079)
    
    * lisp/net/tramp.el (tramp-restricted-shell-hosts-alist):
    Initialize with `system-name' in small and capital chars.
---
 lisp/net/tramp.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 09d1259..50f8c5d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -458,15 +458,20 @@ interpreted as a regular expression which always matches."
   :version "24.3"
   :type 'boolean)
 
+;; For some obscure technical reasons, `system-name' on w32 returns
+;; either lower case or upper case letters.  See
+;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38079#20>.
 (defcustom tramp-restricted-shell-hosts-alist
   (when (memq system-type '(windows-nt))
-    (list (concat "\\`" (regexp-quote (system-name)) "\\'")))
+    (list (format "\\`\\(%s\\|%s\\)\\'"
+                 (regexp-quote (downcase (system-name)))
+                 (regexp-quote (upcase (system-name))))))
   "List of hosts, which run a restricted shell.
 This is a list of regular expressions, which denote hosts running
-a registered shell like \"rbash\".  Those hosts can be used as
+a restricted shell like \"rbash\".  Those hosts can be used as
 proxies only, see `tramp-default-proxies-alist'.  If the local
-host runs a registered shell, it shall be added to this list, too."
-  :version "24.3"
+host runs a restricted shell, it shall be added to this list, too."
+  :version "27.1"
   :type '(repeat (regexp :tag "Host regexp")))
 
 (defcustom tramp-local-host-regexp



reply via email to

[Prev in Thread] Current Thread [Next in Thread]