diff options
| author | Michael Albinus | 2016-11-09 15:34:40 +0100 |
|---|---|---|
| committer | Michael Albinus | 2016-11-09 15:34:40 +0100 |
| commit | dba9bc9752f62c782853c7a652e84e33f0649c3b (patch) | |
| tree | b564b972c121e0c167bc923fc9b7d60337d8c973 /lisp | |
| parent | 112111c4e489aae5cbe241ffa458d97b6a133d3a (diff) | |
| download | emacs-dba9bc9752f62c782853c7a652e84e33f0649c3b.tar.gz 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')
| -rw-r--r-- | lisp/net/tramp.el | 5 |
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." | |||
| 1146 | "Return t if NAME is a string with Tramp file name syntax." | 1146 | "Return t if NAME is a string with Tramp file name syntax." |
| 1147 | (save-match-data | 1147 | (save-match-data |
| 1148 | (and (stringp name) | 1148 | (and (stringp name) |
| 1149 | ;; No "/:" and "/c:". This is not covered by `tramp-file-name-regexp'. | ||
| 1150 | (not (string-match | ||
| 1151 | (if (memq system-type '(cygwin windows-nt)) | ||
| 1152 | "^/[[:alpha:]]?:" "^/:") | ||
| 1153 | name)) | ||
| 1149 | (string-match tramp-file-name-regexp name)))) | 1154 | (string-match tramp-file-name-regexp name)))) |
| 1150 | 1155 | ||
| 1151 | (defun tramp-find-method (method user host) | 1156 | (defun tramp-find-method (method user host) |