diff options
| author | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 11:42:03 +0000 |
|---|---|---|
| committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 11:42:03 +0000 |
| commit | 81088e260b086fe28f36964f32b6338210ec6fd8 (patch) | |
| tree | 53d5af73ca0c971fe6925944d4d059caab5337a2 /lisp/net/net-utils.el | |
| parent | fa1b1007cac59bafd16df7bd501ef2591dd77d62 (diff) | |
| parent | a6f0e674ebf44b1d37732b64070b804673481d28 (diff) | |
| download | emacs-81088e260b086fe28f36964f32b6338210ec6fd8.tar.gz | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-650
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-651
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-652
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-653
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-654
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-655
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-656
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-657
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-658
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-659
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-203
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-204
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-205
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-599
Diffstat (limited to 'lisp/net/net-utils.el')
| -rw-r--r-- | lisp/net/net-utils.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 86bab7b20c5..6a1c1bca8c0 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -674,6 +674,7 @@ queries of the form USER@HOST, and wants a query containing USER only." (defcustom whois-server-list '(("whois.arin.net") ; Networks, ASN's, and related POC's (numbers) ("rs.internic.net") ; domain related info + ("whois.publicinterestregistry.net") ("whois.abuse.net") ("whois.apnic.net") ("nic.ddn.mil") @@ -684,9 +685,12 @@ queries of the form USER@HOST, and wants a query containing USER only." :group 'net-utils :type '(repeat (list string))) +;; FIXME: modern whois clients include a much better tld <-> whois server +;; list, Emacs should probably avoid specifying the server as the client +;; will DTRT anyway... -rfr (defcustom whois-server-tld '(("rs.internic.net" . "com") - ("rs.internic.net" . "org") + ("whois.publicinterestregistry.net" . "org") ("whois.ripe.net" . "be") ("whois.ripe.net" . "de") ("whois.ripe.net" . "dk") @@ -707,7 +711,7 @@ queries of the form USER@HOST, and wants a query containing USER only." (defcustom whois-guess-server t "If non-nil then whois will try to deduce the appropriate whois server from the query. If the query doesn't look like a domain or hostname -then the server named by whois-server-name is used." +then the server named by `whois-server-name' is used." :group 'net-utils :type 'boolean) |