procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp.el (tramp-default-method-alist)

Browse source 
(tramp-default-user-alist, tramp-default-proxies-alist): Adapt
custom options type.  (Bug#7445)
This commit is contained in:
Michael Albinus 2010-11-23 20:52:25 +01:00
parent 4d47208a22
commit e40fc74517
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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).

14
lisp/net/tramp.el
View file

@ -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