# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1290541945 -3600
# Node ID 202eb704e80b05e9591f25e85453ef6fa81d0380
# Parent  c757f4efde4e7c1cb320bdaed44bce762e939453
* net/tramp.el (tramp-default-method-alist)
(tramp-default-user-alist, tramp-default-proxies-alist): Adapt
custom options type.  (Bug#7445)

diff -r c757f4efde4e -r 202eb704e80b lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 23 10:16:21 2010 -0800
+++ b/lisp/ChangeLog	Tue Nov 23 20:52:25 2010 +0100
@@ -1,3 +1,9 @@
+2010-11-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	* 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  <cyd@stupidchicken.com>
 
 	* progmodes/python.el: Add Ipython support (Bug#5390).
diff -r c757f4efde4e -r 202eb704e80b lisp/net/tramp.el
--- a/lisp/net/tramp.el	Tue Nov 23 10:16:21 2010 -0800
+++ b/lisp/net/tramp.el	Tue Nov 23 20:52:25 2010 +0100
@@ -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