Commit c975258a authored by Jim Porter's avatar Jim Porter Committed by Michael Albinus
Browse files

Further fix of hostname completion on MS Windows

* lisp/net/tramp.el (tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate): Fix W32 hostname/method
completion for simplified and separate syntaxes (same as the previous change
to default syntax).

Copyright-paperwork-exempt: yes
parent c50b5907
Pipeline #10223 passed with stages
in 11 minutes and 11 seconds
......@@ -1103,7 +1103,13 @@ On W32 systems, the volume letter must be ignored.")
(defconst tramp-completion-file-name-regexp-simplified
(concat
"\\`/\\("
"\\`"
;; Allow the volume letter at the beginning of the path. See the
;; comment in `tramp-completion-file-name-regexp-default' for more
;; details.
(when (eq system-type 'windows-nt)
"\\(?:[[:alpha:]]:\\)?")
"/\\("
;; Optional multi hop.
"\\([^/|:]*|\\)*"
;; Last hop.
......@@ -1119,7 +1125,14 @@ See `tramp-file-name-structure' for more explanations.
On W32 systems, the volume letter must be ignored.")
(defconst tramp-completion-file-name-regexp-separate
"\\`/\\(\\[[^]]*\\)?\\'"
(concat
"\\`"
;; Allow the volume letter at the beginning of the path. See the
;; comment in `tramp-completion-file-name-regexp-default' for more
;; details.
(when (eq system-type 'windows-nt)
"\\(?:[[:alpha:]]:\\)?")
"/\\(\\[[^]]*\\)?\\'")
"Value for `tramp-completion-file-name-regexp' for separate remoting.
See `tramp-file-name-structure' for more explanations.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment