From e40fc7451704a1d868f9ce5282d759dffc9d9126 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 23 Nov 2010 20:52:25 +0100 Subject: [PATCH] * net/tramp.el (tramp-default-method-alist) (tramp-default-user-alist, tramp-default-proxies-alist): Adapt custom options type. (Bug#7445) --- lisp/ChangeLog | 6 ++++++ lisp/net/tramp.el | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index add4b50bfbd..cc15db8feac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-11-23 Michael Albinus + + * 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 * progmodes/python.el: Add Ipython support (Bug#5390). diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index e0f25ffd1f3..a9733fc6a0f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -814,9 +814,9 @@ empty string for the user name. 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 @@ matches, the variable `tramp-default-user' takes effect. 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 @@ interpreted as a regular expression which always matches." :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 -- 2.39.2