[Emacs-diffs] /srv/bzr/emacs/trunk r102723: * net/tramp.el (tramp-default-method-alist)

[Michael Albinus]

------------------------------------------------------------
revno: 102723
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-30 10:04:15 +0100
message:
  * net/tramp.el (tramp-default-method-alist)
  (tramp-default-user-alist)
  (tramp-local-host-regexp, tramp-prefix-domain-format)
  (tramp-prefix-domain-regexp): Set tramp-autoload cookie.
  
  * net/tramp-ftp.el:
  * net/tramp-gvfs.el:
  * net/tramp-gw.el:
  * net/tramp-imap.el:
  * net/tramp-sh.el:
  * net/tramp-smb.el: Add tramp-autoload cookie for initialisation
  code of `tramp-default-method-alist' and `tramp-default-user-alist'.
modified:
  lisp/ChangeLog
  lisp/net/tramp-ftp.el
  lisp/net/tramp-gvfs.el
  lisp/net/tramp-gw.el
  lisp/net/tramp-imap.el
  lisp/net/tramp-sh.el
  lisp/net/tramp-smb.el
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-29 03:24:09 +0000
+++ b/lisp/ChangeLog    2010-12-30 09:04:15 +0000
@@ -1,3 +1,18 @@
+2010-12-30  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-default-method-alist)
+       (tramp-default-user-alist)
+       (tramp-local-host-regexp, tramp-prefix-domain-format)
+       (tramp-prefix-domain-regexp): Set tramp-autoload cookie.
+
+       * net/tramp-ftp.el:
+       * net/tramp-gvfs.el:
+       * net/tramp-gw.el:
+       * net/tramp-imap.el:
+       * net/tramp-sh.el:
+       * net/tramp-smb.el: Add tramp-autoload cookie for initialisation
+       code of `tramp-default-method-alist' and `tramp-default-user-alist'.
+
 2010-12-29  Karl Fogel  <address@hidden>
 
        * saveplace.el (save-place-alist-to-file): Save list sorted and

=== modified file 'lisp/net/tramp-ftp.el'
--- a/lisp/net/tramp-ftp.el     2010-12-02 19:34:31 +0000
+++ b/lisp/net/tramp-ftp.el     2010-12-30 09:04:15 +0000
@@ -105,13 +105,13 @@
 ;; ... and add it to the method list.
 ;;;###tramp-autoload
 (unless (featurep 'xemacs)
-  (add-to-list 'tramp-methods (cons tramp-ftp-method nil)))
+  (add-to-list 'tramp-methods (cons tramp-ftp-method nil))
 
-;; Add some defaults for `tramp-default-method-alist'.
-(add-to-list 'tramp-default-method-alist
-            (list "\\`ftp\\." nil tramp-ftp-method))
-(add-to-list 'tramp-default-method-alist
-            (list nil "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method))
+  ;; Add some defaults for `tramp-default-method-alist'.
+  (add-to-list 'tramp-default-method-alist
+              (list "\\`ftp\\." nil tramp-ftp-method))
+  (add-to-list 'tramp-default-method-alist
+              (list nil "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method)))
 
 ;; Add completion function for FTP method.
 (tramp-set-completion-function

=== modified file 'lisp/net/tramp-gvfs.el'
--- a/lisp/net/tramp-gvfs.el    2010-12-02 19:34:31 +0000
+++ b/lisp/net/tramp-gvfs.el    2010-12-30 09:04:15 +0000
@@ -124,6 +124,7 @@
 
 ;; Add a default for `tramp-default-user-alist'.  Rule: For the SYNCE
 ;; method, no user is chosen.
+;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil))
 
 (defcustom tramp-gvfs-zeroconf-domain "local"

=== modified file 'lisp/net/tramp-gw.el'
--- a/lisp/net/tramp-gw.el      2010-12-02 19:34:31 +0000
+++ b/lisp/net/tramp-gw.el      2010-12-30 09:04:15 +0000
@@ -72,6 +72,7 @@
   (list "Default server" "socks" tramp-gw-default-socks-port 5))
 
 ;; Add a default for `tramp-default-user-alist'.  Default is the local user.
+;;;###tramp-autoload
 (add-to-list
  'tramp-default-user-alist
  (list (concat "\\`"

=== modified file 'lisp/net/tramp-imap.el'
--- a/lisp/net/tramp-imap.el    2010-12-02 19:34:31 +0000
+++ b/lisp/net/tramp-imap.el    2010-12-30 09:04:15 +0000
@@ -96,6 +96,7 @@
               (list tramp-imaps-method '(tramp-default-port 993))))
 
 ;; Add a default for `tramp-default-user-alist'.  Default is the local user.
+;;;###tramp-autoload
 (add-to-list
  'tramp-default-user-alist
  (list (concat "\\`"

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2010-12-27 10:56:26 +0000
+++ b/lisp/net/tramp-sh.el      2010-12-30 09:04:15 +0000
@@ -380,13 +380,16 @@
     (tramp-copy-args            (("%k" "-p")))
     (tramp-copy-keep-date       t)))
 
+;;;###tramp-autoload
 (add-to-list 'tramp-default-method-alist
             `(,tramp-local-host-regexp "\\`root\\'" "su"))
 
+;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist
             `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'")
               nil "root"))
 ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
+;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist
             `(,(concat
                 "\\`"

=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el     2010-12-02 19:34:31 +0000
+++ b/lisp/net/tramp-smb.el     2010-12-30 09:04:15 +0000
@@ -43,11 +43,13 @@
 
 ;; Add a default for `tramp-default-method-alist'. Rule: If there is
 ;; a domain in USER, it must be the SMB method.
+;;;###tramp-autoload
 (add-to-list 'tramp-default-method-alist
             `(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.
+;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist
             `(,(concat "\\`" tramp-smb-method "\\'") nil nil))
 

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-12-14 20:33:33 +0000
+++ b/lisp/net/tramp.el 2010-12-30 09:04:15 +0000
@@ -318,6 +318,7 @@
   :group 'tramp
   :type 'string)
 
+;;;###tramp-autoload
 (defcustom tramp-default-method-alist nil
   "*Default method to use for specific host/user pairs.
 This is an alist of items (HOST USER METHOD).  The first matching item
@@ -344,6 +345,7 @@
   :group 'tramp
   :type '(choice (const nil) string))
 
+;;;###tramp-autoload
 (defcustom tramp-default-user-alist nil
   "*Default user to use for specific method/host pairs.
 This is an alist of items (METHOD HOST USER).  The first matching item
@@ -384,6 +386,7 @@
                       (choice :tag "User regexp" regexp sexp)
                       (choice :tag " Proxy name" string (const nil)))))
 
+;;;###tramp-autoload
 (defconst tramp-local-host-regexp
   (concat
    "\\`"
@@ -666,9 +669,11 @@
 (defconst tramp-user-regexp "[^:/ \t]+"
   "*Regexp matching user names.")
 
+;;;###tramp-autoload
 (defconst tramp-prefix-domain-format "%"
   "*String matching delimeter between user and domain names.")
 
+;;;###tramp-autoload
 (defconst tramp-prefix-domain-regexp
   (regexp-quote tramp-prefix-domain-format)
   "*Regexp matching delimeter between user and domain names.