(mail-extr-all-top-level-domains): Update domain list.

1 files changed, 98 insertions, 20 deletions

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index a10d64bc06c..f4fba8c4db8 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1779,93 +1779,171 @@ If ADDRESS contains more than one RFC-822 address, only the first is
              (if (nth 2 x)
                  (format (nth 2 x) (nth 1 x))
                (nth 1 x)))))
-     '(("ag" "Antigua")
+     '(
+       ;; ISO 3166 codes:
+       ("ae" "United Arab Emirates")
+       ("ag" "Antigua and Barbuda")
+       ("al" "Albania")
+       ("ao" "Angola")
+       ("aq" "Antarctica")              ; continent
        ("ar" "Argentina"        "Argentine Republic")
-       ("arpa" t                "Advanced Projects Research Agency")
        ("at" "Austria"          "The Republic of %s")
        ("au" "Australia")
+       ("az" "Azerbaijan")
        ("bb" "Barbados")
+       ("bd" "Bangladesh")
        ("be" "Belgium"          "The Kingdom of %s")
+       ("bf" "Burkina Faso")
        ("bg" "Bulgaria")
-       ("bitnet" t              "Because It's Time NET")
+       ("bh" "Bahrain")
+       ("bm" "Bermuda")
        ("bo" "Bolivia"          "Republic of %s")
        ("br" "Brazil"           "The Federative Republic of %s")
        ("bs" "Bahamas")
+       ("bw" "Botswana")
+       ("by" "Belarus")
        ("bz" "Belize")
        ("ca" "Canada")
+       ("cg" "Congo")
        ("ch" "Switzerland"      "The Swiss Confederation")
+       ("ci" "Ivory Coast")
        ("cl" "Chile"            "The Republic of %s")
+       ("cm" "Cameroon")                ; In .fr domain
        ("cn" "China"            "The People's Republic of %s")
-       ("co" "Columbia")
-       ("com" t                 "Commercial organizations (U.S.A.)")
+       ("co" "Colombia")
        ("cr" "Costa Rica"       "The Republic of %s")
        ("cs" "Czechoslovakia")
+       ("cu" "Cuba")
+       ("cy" "Cyprus")
+       ("cz" "Czech Republic")
        ("de" "Germany")
        ("dk" "Denmark")
        ("dm" "Dominica")
        ("do" "Dominican Republic"       "The %s")
+       ("dz" "Algeria")
        ("ec" "Ecuador"          "The Republic of %s")
-       ("edu" t                 "Educational institutions (U.S.A.)")
+       ("ee" "Estonia")
        ("eg" "Egypt"            "The Arab Republic of %s")
+       ("er" "Eritrea")
        ("es" "Spain"            "The Kingdom of %s")
        ("fi" "Finland"          "The Republic of %s")
        ("fj" "Fiji")
+       ("fo" "Faroe Islands")
        ("fr" "France")
-       ("gov" t                 "Government (U.S.A.)")
+       ("gb" "Great Britain")
+       ("gd" "Grenada")
+       ("ge" "Georgia")
+       ("gf" "Guyana (Fr.)")
+       ("gp" "Guadeloupe (Fr.)")
        ("gr" "Greece"           "The Hellenic Republic (%s)")
+       ("gt" "Guatemala")
+       ("gu" "Guam (U.S.)")
        ("hk" "Hong Kong")
+       ("hn" "Honduras")
+       ("hr" "Croatia")
+       ("ht" "Haiti")
        ("hu" "Hungary"          "The Hungarian People's Republic")      ;???
+       ("id" "Indonesia")
        ("ie" "Ireland")
        ("il" "Israel"           "The State of %s")
        ("in" "India"            "The Republic of %s")
-       ("int" t                 "(something British, don't know what)")
+       ("ir" "Iran")
        ("is" "Iceland"          "The Republic of %s")
        ("it" "Italy"            "The Italian Republic")
        ("jm" "Jamaica")
        ("jp" "Japan")
-       ("kn" "St. Kitts and Nevis")
-       ("kr" "South Korea")
+       ("ke" "Kenya")
+       ("kn" "St. Kitts, Nevis, and Anguilla")
+       ("kp" "Korea (North)")
+       ("kr" "Korea (South)")
+       ("kw" "Kuwait")
+       ("kz" "Kazachstan")
+       ("lb" "Lebanon")
        ("lc" "St. Lucia")
+       ("li" "Liechtenstein")
        ("lk" "Sri Lanka"        "The Democratic Socialist Republic of %s")
-       ("mil" t                 "Military (U.S.A.)")
+       ("ls" "Lesotho")
+       ("lt" "Lithuania")
+       ("lu" "Luxembourg")
+       ("lv" "Latvia")
+       ("ma" "Morocco")
+       ("md" "Moldova")
+       ("mg" "Madagascar")
+       ("mk" "Macedonia")
+       ("ml" "Mali")
+       ("mo" "Macau")
+       ("mt" "Malta")
+       ("mu" "Mauritius")
+       ("mw" "Malawi")
        ("mx" "Mexico"           "The United Mexican States")
        ("my" "Malaysia"         "%s (changed to Myanmar?)")             ;???
+       ("mz" "Mozambique")
        ("na" "Namibia")
-       ("nato" t                "North Atlantic Treaty Organization")
-       ("net" t                 "Network")
+       ("nc" "New Caledonia (Fr.)")
+       ("ne" "Niger")                   ; In .fr domain
        ("ni" "Nicaragua"        "The Republic of %s")
        ("nl" "Netherlands"      "The Kingdom of the %s")
        ("no" "Norway"           "The Kingdom of %s")
+       ("np" "Nepal")                   ; Via .in domain
        ("nz" "New Zealand")
-       ("org" t                 "Non-commercial organizations (U.S.A.)")
+       ("pa" "Panama")
        ("pe" "Peru")
+       ("pf" "Polynesia (Fr.)")
        ("pg" "Papua New Guinea")
        ("ph" "Philippines"      "The Republic of the %s")
+       ("pk" "Pakistan")
        ("pl" "Poland")
-       ("pr" "Puerto Rico")
+       ("pr" "Puerto Rico (U.S.)")
        ("pt" "Portugal"         "The Portugese Republic")
        ("py" "Paraguay")
+       ("re" "Reunion (Fr.)")           ; In .fr domain
+       ("ro" "Romania")
+       ("ru" "Russian Federation")
+       ("sa" "Saudi Arabia")
+       ("sc" "Seychelles")
+       ("sd" "Sudan")
        ("se" "Sweden"           "The Kingdom of %s")
        ("sg" "Singapore"        "The Republic of %s")
+       ("si" "Slovenia")
+       ("sj" "Svalbard and Jan Mayen Is.") ; In .no domain
+       ("sk" "Slovakia"         "The Slovak Republic")
+       ("sn" "Senegal")
        ("sr" "Suriname")
        ("su" "Soviet Union")
+       ("sz" "Swaziland")
+       ("tg" "Togo")
        ("th" "Thailand"         "The Kingdom of %s")
+       ("tm" "Turkmenistan")            ; In .su domain
        ("tn" "Tunisia")
        ("tr" "Turkey"           "The Republic of %s")
        ("tt" "Trinidad and Tobago")
        ("tw" "Taiwan")
+       ("ua" "Ukraine")
        ("uk" "United Kingdom"   "The %s of Great Britain and Northern Ireland")
-       ("unter-dom" t           "(something German)")
-       ("us" "U.S.A."           "The United States of America")
-       ("uucp" t                "Unix to Unix CoPy")
+       ("us" "United States"    "The %s of America")
        ("uy" "Uruguay"          "The Eastern Republic of %s")
        ("vc" "St. Vincent and the Grenadines")
        ("ve" "Venezuela"        "The Republic of %s")
+       ("vi" "Virgin Islands (U.S.)")
+       ("vn" "Vietnam")
+       ("vu" "Vanuatu")
        ("yu" "Yugoslavia"       "The Socialist Federal Republic of %s")
-       ;; Also said to be Zambia ... (why not Zaire???)
        ("za" "South Africa"     "The Republic of %s (or Zambia? Zaire?)")
        ("zw" "Zimbabwe"         "Republic of %s")
-;; fipnet
+       ;; Special top-level domains:
+       ("arpa" t                "Advanced Research Projects Agency (U.S. DoD)")
+       ("bitnet" t              "Because It's Time NET")
+       ("com" t                 "Commercial")
+       ("edu" t                 "Educational")
+       ("gov" t                 "Government (U.S.)")
+       ("int" t                 "International (NATO)")
+       ("mil" t                 "Military (U.S.)")
+       ("nato" t                "North Atlantic Treaty Organization")
+       ("net" t                 "Network")
+       ("org" t                 "Non-profit Organization")
+       ;;("unter-dom" t         "? (Ger.)")
+       ("uucp" t                "Unix to Unix CoPy")
+       ;;("fipnet" nil          "?")
        ))
     ob))