[Emacs-diffs] Changes to emacs/lisp/net/tramp.el

[Kai Großjohann]

Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.9 emacs/lisp/net/tramp.el:1.10
*** emacs/lisp/net/tramp.el:1.9 Thu Jul 11 16:26:19 2002
--- emacs/lisp/net/tramp.el     Sat Jul 13 13:41:01 2002
***************
*** 1024,1032 ****
    :type 'string)
  
  (defconst tramp-multi-file-name-structure-unified
!   (list (concat "\\`\\([a-zA-Z0-9]+\\)\\)?" ;method
                "\\(\\(%s\\)+\\)"       ;hops
!               ":\\(.*\\)\\'")         ;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.
--- 1024,1032 ----
    :type 'string)
  
  (defconst tramp-multi-file-name-structure-unified
!   (list (concat "\\`/\\(\\([a-zA-Z0-9]+\\)?:\\)" ;method
                "\\(\\(%s\\)+\\)"       ;hops
!               "\\(.*\\)\\'")          ;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,1041 ****
  (defconst tramp-file-name-structure-separate
    (list (concat
           ;; prefix
!          "\\`/\\[\\(\\([a-z0-9]+\\)\\)?"
           ;; regexp specifying the hops
           "\\(\\(%s\\)+\\)"
           ;; path name
--- 1035,1041 ----
  (defconst tramp-file-name-structure-separate
    (list (concat
           ;; prefix
!          "\\`/\\[\\(\\([a-z0-9]+\\)?\\)"
           ;; regexp specifying the hops
           "\\(\\(%s\\)+\\)"
           ;; path name
***************
*** 1079,1087 ****
                 (integer :tag "Paren pair to match path")))
  
  (defconst tramp-multi-file-name-hop-structure-unified
!   (list (concat ":\\([a-zA-z0-9_]+\\):" ;hop method
                "\\([^@:/]+\\)@"        ;user
!               "\\([^:/]+\\)")         ;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.
--- 1079,1087 ----
                 (integer :tag "Paren pair to match path")))
  
  (defconst tramp-multi-file-name-hop-structure-unified
!   (list (concat "\\([a-zA-z0-9_]+\\):" ;hop method
                "\\([^@:/]+\\)@"        ;user
!               "\\([^:/]+\\):")        ;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.