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

[Michael Albinus]

------------------------------------------------------------
revno: 100240
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-11-23 20:52:25 +0100
message:
  * net/tramp.el (tramp-default-method-alist)
  (tramp-default-user-alist, tramp-default-proxies-alist): Adapt
  custom options type.  (Bug#7445)
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-21 17:04:43 +0000
+++ b/lisp/ChangeLog    2010-11-23 19:52:25 +0000
@@ -1,3 +1,9 @@
+2010-11-23  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-default-method-alist)
+       (tramp-default-user-alist, tramp-default-proxies-alist): Adapt
+       custom options type.  (Bug#7445)
+
 2010-11-21  Chong Yidong  <address@hidden>
 
        * progmodes/python.el: Add Ipython support (Bug#5390).

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-11-13 10:08:21 +0000
+++ b/lisp/net/tramp.el 2010-11-23 19:52:25 +0000
@@ -814,9 +814,9 @@
 
 See `tramp-methods' for a list of possibilities for METHOD."
   :group 'tramp
-  :type '(repeat (list (regexp :tag "Host regexp")
-                      (regexp :tag "User regexp")
-                      (string :tag "Method"))))
+  :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
+                      (choice :tag "User regexp" regexp sexp)
+                      (choice :tag "Method name" string (const nil)))))
 
 (defcustom tramp-default-user
   nil
@@ -842,9 +842,9 @@
 If the file name does not specify the method, lookup is done using the
 empty string for the method name."
   :group 'tramp
-  :type '(repeat (list (regexp :tag "Method regexp")
-                      (regexp :tag "Host regexp")
-                      (string :tag "User"))))
+  :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
+                      (choice :tag "  Host regexp" regexp sexp)
+                      (choice :tag "    User name" string (const nil)))))
 
 (defcustom tramp-default-host
   (system-name)
@@ -870,7 +870,7 @@
   :group 'tramp
   :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
                       (choice :tag "User regexp" regexp sexp)
-                      (choice :tag "Proxy remote name" string (const nil)))))
+                      (choice :tag " Proxy name" string (const nil)))))
 
 (defconst tramp-local-host-regexp
   (concat