* net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.

(tramp-smb-maybe-open-connection): Use `tramp-file-name-*'
methods.

2 files changed, 36 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38c3d01cccc..2a38194d096 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,29 @@
+2009-01-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el (dbus-string-to-byte-array): Handle empty string.
+
+        * net/tramp.el (tramp-local-host-regexp)
+        (tramp-prefix-domain-format)
+        (tramp-prefix-domain-regexp, tramp-domain-regexp)
+        (tramp-user-with-domain-regexp, tramp-prefix-ipv6-format)
+        (tramp-prefix-ipv6-regexp, tramp-ipv6-regexp)
+        (tramp-postfix-ipv6-format, tramp-postfix-ipv6-regexp): New
+        defconst.
+        (tramp-file-name-structure, tramp-file-name-regexp-unified)
+        (tramp-completion-dissect-file-name, tramp-parse-hosts-group)
+        (tramp-dissect-file-name, tramp-make-tramp-file-name)
+        (tramp-completion-make-tramp-file-name): Handle IPv6 addresses.
+        (tramp-handle-insert-file-contents): Fix setting of
+        `buffer-read-only'.
+        (tramp-compute-multi-hops, tramp-local-host-p): Use
+        `tramp-local-host-regexp'.
+        (tramp-file-name-real-user, tramp-file-name-domain): Use
+        `tramp-user-with-domain-regexp'.
+
+        * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
+        (tramp-smb-maybe-open-connection): Use `tramp-file-name-*'
+        methods.
+
 2009-01-03  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
         * proced.el (proced-grammar-alist): Refiner can be a
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index af6cf93dd1e..4ce8aa7fce6 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1,7 +1,7 @@
 ;;; tramp-smb.el --- Tramp access functions for SMB servers
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -44,7 +44,7 @@
 ;; Add a default for `tramp-default-method-alist'. Rule: If there is
 ;; a domain in USER, it must be the SMB method.
 (add-to-list 'tramp-default-method-alist
-             `(nil "%" ,tramp-smb-method))
+             `(nil ,tramp-prefix-domain-regexp ,tramp-smb-method))
 
 ;; Add a default for `tramp-default-user-alist'. Rule: For the SMB method,
 ;; the anonymous user is chosen.
@@ -905,20 +905,13 @@ connection if a previous connection has died for some reason."
                   (executable-find tramp-smb-program))
           (error "Cannot find command %s in %s" tramp-smb-program exec-path))
 
-        (let* ((user (tramp-file-name-user vec))
-               (host (tramp-file-name-host vec))
-               (real-user user)
-               (real-host host)
-               domain port args)
-
-          ;; Check for domain ("user%domain") and port ("host#port").
-          (when (and user (string-match "\\(.+\\)%\\(.+\\)" user))
-            (setq real-user (or (match-string 1 user) user)
-                  domain (match-string 2 user)))
-
-          (when (and host (string-match "\\(.+\\)#\\(.+\\)" host))
-            (setq real-host (or (match-string 1 host) host)
-                  port (match-string 2 host)))
+        (let* ((user      (tramp-file-name-user vec))
+               (host      (tramp-file-name-host vec))
+               (real-user (tramp-file-name-real-user vec))
+               (real-host (tramp-file-name-real-host vec))
+               (domain    (tramp-file-name-domain vec))
+               (port      (tramp-file-name-port vec))
+               args)
 
           (if share
               (setq args (list (concat "//" real-host "/" share)))