Mercurial > emacs

diff lisp/net/tramp.el @ 46347:3996ea20e5e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(tramp-multi-file-name-structure-unified): Add missing slash and move colon from start to end of each hop. (tramp-multi-file-name-hop-structure-unified): Move colon from start to end of each hop.
author Kai Großjohann <kgrossjo@eu.uu.net>
date Sat, 13 Jul 2002 17:41:01 +0000
parents a2d047d50fb9
children f548d7d0c651
line wrap: on
line diff
--- a/lisp/net/tramp.el	Sat Jul 13 10:52:22 2002 +0000
+++ b/lisp/net/tramp.el	Sat Jul 13 17:41:01 2002 +0000
@@ -1024,9 +1024,9 @@
   :type 'string)
 
 (defconst tramp-multi-file-name-structure-unified
-  (list (concat "\\`\\([a-zA-Z0-9]+\\)\\)?" ;method
+  (list (concat "\\`/\\(\\([a-zA-Z0-9]+\\)?:\\)" ;method
 		"\\(\\(%s\\)+\\)"	;hops
-		":\\(.*\\)\\'")		;path
+		"\\(.*\\)\\'")		;path
 	2 3 -1)
   "Value for `tramp-multi-file-name-structure' for unified remoting.
 Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and Tramp.
@@ -1035,7 +1035,7 @@
 (defconst tramp-file-name-structure-separate
   (list (concat
          ;; prefix
-         "\\`/\\[\\(\\([a-z0-9]+\\)\\)?"
+         "\\`/\\[\\(\\([a-z0-9]+\\)?\\)"
          ;; regexp specifying the hops
          "\\(\\(%s\\)+\\)"
          ;; path name
@@ -1079,9 +1079,9 @@
                (integer :tag "Paren pair to match path")))
 
 (defconst tramp-multi-file-name-hop-structure-unified
-  (list (concat ":\\([a-zA-z0-9_]+\\):" ;hop method
+  (list (concat "\\([a-zA-z0-9_]+\\):" ;hop method
 		"\\([^@:/]+\\)@"	;user
-		"\\([^:/]+\\)")		;host
+		"\\([^:/]+\\):")	;host
 	1 2 3)
   "Value of `tramp-multi-file-name-hop-structure' for unified remoting.
 Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and Tramp.