# HG changeset patch
# User Kai Gro���johann <kgrossjo@eu.uu.net>
# Date 1026582061 0
# Node ID 3996ea20e5e3854338e4229e2b01837367afc97b
# Parent  49f06e689a20f4d851608920c92f39466a44c51a
(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.

diff -r 49f06e689a20 -r 3996ea20e5e3 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 13 10:52:22 2002 +0000
+++ b/lisp/ChangeLog	Sat Jul 13 17:41:01 2002 +0000
@@ -1,3 +1,10 @@
+2002-07-13  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+	* net/tramp.el (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.
+
 2002-07-13  Kim F. Storm  <storm@cua.dk>
 
 	* progmodes/compile.el (grep-tree): Fixed autoload.
diff -r 49f06e689a20 -r 3996ea20e5e3 lisp/net/tramp.el
--- 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.