(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3288513e3816f8839a53b9430e512c0e34ca4d2..807db3df9078015e49486f057c574b7130c907bc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-13  Kai Gro\e,b_\e(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 --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a845ed9335efd9b837a58bfdecd02784fb546aac..6491a4cade902437b38ad0820d2fa7c0271ce4db 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1024,9 +1024,9 @@ Also see `tramp-make-tramp-file-format', `tramp-file-name-structure', and `tramp
   :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 @@ See `tramp-file-name-structure-unified' for details.")
 (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 @@ string, but I haven't actually tried what happens if it doesn't..."
                (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.