summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2016-11-09 15:34:40 +0100
committerMichael Albinus <michael.albinus@gmx.de>2016-11-09 15:34:40 +0100
commitdba9bc9752f62c782853c7a652e84e33f0649c3b (patch)
treeb564b972c121e0c167bc923fc9b7d60337d8c973 /lisp/net
parent112111c4e489aae5cbe241ffa458d97b6a133d3a (diff)
downloademacs-dba9bc9752f62c782853c7a652e84e33f0649c3b.tar.gz
emacs-dba9bc9752f62c782853c7a652e84e33f0649c3b.tar.bz2
emacs-dba9bc9752f62c782853c7a652e84e33f0649c3b.zip
Refine multi-hop specs in Tramp
* lisp/net/tramp.el (tramp-tramp-file-p): Suppress "/:" and "/c:". * test/lisp/net/tramp-tests.el (tramp-test01-file-name-syntax): Multi-hop specs don't need a method. "/h:" is allowed on non MS Windows.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8a81311508f..00ecb375c59 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1146,6 +1146,11 @@ entry does not exist, return nil."
"Return t if NAME is a string with Tramp file name syntax."
(save-match-data
(and (stringp name)
+ ;; No "/:" and "/c:". This is not covered by `tramp-file-name-regexp'.
+ (not (string-match
+ (if (memq system-type '(cygwin windows-nt))
+ "^/[[:alpha:]]?:" "^/:")
+ name))
(string-match tramp-file-name-regexp name))))
(defun tramp-find-method (method user host)