(mail-extr-all-top-level-domains): Increase

the size of the obarray.
(mail-extr-all-top-level-domains): Add more toplevel domains,
add more long names.
From: Per Starback <starback@ling.uu.se>.

1 files changed, 99 insertions, 20 deletions

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 5e693dc11f4..5a7f5370340 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,6 +1,7 @@
 ;;; mail-extr.el --- extract full name and address from RFC 822 mail header.
 
-;; Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001
+;;   Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@cs.bu.edu>
 ;; Maintainer: FSF
@@ -1842,7 +1843,7 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
 ;; abbreviations.
 
 (defconst mail-extr-all-top-level-domains
-  (let ((ob (make-vector 509 0)))
+  (let ((ob (make-vector 739 0)))
     (mapcar
      (function
       (lambda (x)
@@ -1855,14 +1856,19 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ;; ISO 3166 codes:
        ("ad" "Andorra")
        ("ae" "United Arab Emirates")
+       ("af" "Afghanistan")
        ("ag" "Antigua and Barbuda")
+       ("ai" "Anguilla")
        ("al" "Albania")
        ("am" "Armenia")
+       ("an" "Netherlands Antilles")
        ("ao" "Angola")
        ("aq" "Antarctica")              ; continent
        ("ar" "Argentina"        "Argentine Republic")
+       ("as" "American Samoa")
        ("at" "Austria"          "The Republic of %s")
        ("au" "Australia")
+       ("aw" "Aruba")
        ("az" "Azerbaijan")
        ("ba" "Bosnia-Herzegovina")
        ("bb" "Barbados")
@@ -1871,27 +1877,38 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("bf" "Burkina Faso")
        ("bg" "Bulgaria")
        ("bh" "Bahrain")
+       ("bi" "Burundi")
+       ("bj" "Benin")
        ("bm" "Bermuda")
+       ("bn" "Brunei Darussalam")
        ("bo" "Bolivia"          "Republic of %s")
        ("br" "Brazil"           "The Federative Republic of %s")
        ("bs" "Bahamas")
+       ("bt" "Bhutan")
+       ("bv" "Bouvet Island")
        ("bw" "Botswana")
        ("by" "Belarus")
        ("bz" "Belize")
        ("ca" "Canada")
+       ("cc" "Cocos (Keeling) Islands")
+       ("cd" "The Democratic Republic of The Congo")
+       ("cf" "Central African Republic")
        ("cg" "Congo")
        ("ch" "Switzerland"      "The Swiss Confederation")
-       ("ci" "Ivory Coast")
+       ("ci" "Ivory Coast")             ; Cote D'ivoire
+       ("ck" "Cook Islands")
        ("cl" "Chile"            "The Republic of %s")
        ("cm" "Cameroon")                ; In .fr domain
        ("cn" "China"            "The People's Republic of %s")
        ("co" "Colombia")
        ("cr" "Costa Rica"       "The Republic of %s")
-       ("cs" "Czechoslovakia")
        ("cu" "Cuba")
+       ("cv" "Cape Verde")
+       ("cx" "Christmas Island")
        ("cy" "Cyprus")
        ("cz" "Czech Republic")
        ("de" "Germany")
+       ("dj" "Djibouti")
        ("dk" "Denmark")
        ("dm" "Dominica")
        ("do" "Dominican Republic"       "The %s")
@@ -1899,25 +1916,36 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("ec" "Ecuador"          "The Republic of %s")
        ("ee" "Estonia")
        ("eg" "Egypt"            "The Arab Republic of %s")
+       ("eh" "Western Sahara")
        ("er" "Eritrea")
        ("es" "Spain"            "The Kingdom of %s")
        ("et" "Ethiopia")
        ("fi" "Finland"          "The Republic of %s")
+       ("fj" "Fiji")
+       ("fk" "Falkland Islands (Malvinas)")
+       ("fm" "Micronesia"       "Federated States of %s")
        ("fo" "Faroe Islands")
        ("fr" "France")
        ("ga" "Gabon")
        ("gb" "United Kingdom")
        ("gd" "Grenada")
        ("ge" "Georgia")
-       ("gf" "Guyana (Fr.)")
-       ("gj" "Fiji")
+       ("gf" "French Guiana")
+       ("gh" "Ghana")
+       ("gi" "Gibraltar")
        ("gl" "Greenland")
        ("gm" "Gambia")
+       ("gn" "Guinea")
        ("gp" "Guadeloupe (Fr.)")
+       ("gq" "Equatorial Guinea")
        ("gr" "Greece"           "The Hellenic Republic (%s)")
+       ("gs" "South Georgia And The South Sandwich Islands")
        ("gt" "Guatemala")
        ("gu" "Guam (U.S.)")
+       ("gw" "Guinea-Bissau")
+       ("gy" "Guyana")
        ("hk" "Hong Kong")
+       ("hm" "Heard Island And Mcdonald Islands")
        ("hn" "Honduras")
        ("hr" "Croatia"          "Croatia (Hrvatska)")
        ("ht" "Haiti")
@@ -1925,35 +1953,52 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("id" "Indonesia")
        ("ie" "Ireland")
        ("il" "Israel"           "The State of %s")
-       ("im" "Isle of Man"      "The %s")
+       ("im" "Isle of Man"      "The %s") ; NOT in ISO 3166-1 of 2001-02-26
        ("in" "India"            "The Republic of %s")
-       ("ir" "Iran")
+       ("io" "British Indian Ocean Territory")
+       ("iq" "Iraq")
+       ("ir" "Iran"             "Islamic Republic of %s")
        ("is" "Iceland"          "The Republic of %s")
        ("it" "Italy"            "The Italian Republic")
        ("jm" "Jamaica")
        ("jo" "Jordan")
        ("jp" "Japan")
        ("ke" "Kenya")
-       ("kn" "St. Kitts, Nevis, and Anguilla")
-       ("kp" "Korea (North)")
-       ("kr" "Korea (South)")
+       ("kg" "Kyrgyzstan")
+       ("kh" "Cambodia")
+       ("ki" "Kiribati")
+       ("km" "Comoros")
+       ("kn" "Saint Kitts and Nevis")
+       ("kp" "Korea (North)"    "Democratic People's Republic of Korea")
+       ("kr" "Korea (South)"    "Republic of Korea")
        ("kw" "Kuwait")
-       ("kz" "Kazakhstan")
+       ("ky" "Cayman Islands")
+       ("kz" "Kazakstan")
+       ("la" "Lao People's Democratic Republic")
        ("lb" "Lebanon")
-       ("lc" "St. Lucia")
+       ("lc" "Saint Lucia")
        ("li" "Liechtenstein")
        ("lk" "Sri Lanka"        "The Democratic Socialist Republic of %s")
+       ("lr" "Liberia")
        ("ls" "Lesotho")
        ("lt" "Lithuania")
        ("lu" "Luxembourg")
        ("lv" "Latvia")
+       ("ly" "Libyan Arab Jamahiriya")
        ("ma" "Morocco")
        ("mc" "Monaco")
        ("md" "Moldova"          "The Republic of %s")
        ("mg" "Madagascar")
-       ("mk" "Macedonia")
+       ("mh" "Marshall Islands")
+       ("mk" "Macedonia"        "The Former Yugoslav Republic of %s")
        ("ml" "Mali")
+       ("mm" "Myanmar")
+       ("mn" "Mongolia")
        ("mo" "Macau")
+       ("mp" "Northern Mariana Islands")
+       ("mq" "Martinique")
+       ("mr" "Mauritania")
+       ("ms" "Montserrat")
        ("mt" "Malta")
        ("mu" "Mauritius")
        ("mv" "Maldives")
@@ -1964,12 +2009,16 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("na" "Namibia")
        ("nc" "New Caledonia (Fr.)")
        ("ne" "Niger")                   ; In .fr domain
+       ("nf" "Norfolk Island")
+       ("ng" "Nigeria")
        ("ni" "Nicaragua"        "The Republic of %s")
        ("nl" "Netherlands"      "The Kingdom of the %s")
        ("no" "Norway"           "The Kingdom of %s")
        ("np" "Nepal")                   ; Via .in domain
+       ("nr" "Nauru")
        ("nu" "Niue")
        ("nz" "New Zealand")
+       ("om" "Oman")
        ("pa" "Panama")
        ("pe" "Peru")
        ("pf" "Polynesia (Fr.)")
@@ -1977,45 +2026,75 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("ph" "Philippines"      "The Republic of the %s")
        ("pk" "Pakistan")
        ("pl" "Poland")
+       ("pm" "Saint Pierre and Miquelon")
+       ("pn" "Pitcairn")
        ("pr" "Puerto Rico (U.S.)")
+       ("ps" "Palestinian Territory, Occupied")
        ("pt" "Portugal"         "The Portuguese Republic")
+       ("pw" "Palau")
        ("py" "Paraguay")
        ("qa" "Qatar")
        ("re" "Reunion (Fr.)")           ; In .fr domain
        ("ro" "Romania")
-       ("ru" "Russian Federation")
+       ("ru" "Russia"           "Russian Federation")
+       ("rw" "Rwanda")
        ("sa" "Saudi Arabia")
+       ("sb" "Solomon Islands")
        ("sc" "Seychelles")
        ("sd" "Sudan")
        ("se" "Sweden"           "The Kingdom of %s")
        ("sg" "Singapore"        "The Republic of %s")
+       ("sh" "Saint Helena")
        ("si" "Slovenia")
-       ("sj" "Svalbard and Jan Mayen Is.") ; In .no domain
+       ("sj" "Svalbard and Jan Mayen") ; In .no domain
        ("sk" "Slovakia"         "The Slovak Republic")
+       ("sl" "Sierra Leone")
        ("sm" "San Marino")
        ("sn" "Senegal")
+       ("so" "Somalia")
        ("sr" "Suriname")
-       ("su" "U.S.S.R."         "The Union of Soviet Socialist Republics")
+       ("st" "Sao Tome And Principe")
+       ("su" "U.S.S.R." "The Union of Soviet Socialist Republics")
+       ("sv" "El Salvador")
+       ("sy" "Syrian Arab Republic")
        ("sz" "Swaziland")
+       ("tc" "Turks And Caicos Islands")
+       ("td" "Chad")
+       ("tf" "French Southern Territories")
        ("tg" "Togo")
        ("th" "Thailand"         "The Kingdom of %s")
-       ("tm" "Turkmenistan")            ; In .su domain
+       ("tj" "Tajikistan")
+       ("tk" "Tokelau")
+       ("tm" "Turkmenistan")
        ("tn" "Tunisia")
        ("to" "Tonga")
+       ("tp" "East Timor")
        ("tr" "Turkey"           "The Republic of %s")
        ("tt" "Trinidad and Tobago")
-       ("tw" "Taiwan")
+       ("tv" "Tuvalu")
+       ("tw" "Taiwan"           "%s, Province of China")
+       ("tz" "Tanzania"         "United Republic of %s")
        ("ua" "Ukraine")
+       ("ug" "Uganda")
        ("uk" "United Kingdom"   "The %s of Great Britain and Northern Ireland")
+       ("um" "United States Minor Outlying Islands")
        ("us" "United States"    "The %s of America")
        ("uy" "Uruguay"          "The Eastern Republic of %s")
+       ("uz" "Uzbekistan")
+       ("va" "Holy See (Vatican City State)")
        ("vc" "St. Vincent and the Grenadines")
        ("ve" "Venezuela"        "The Republic of %s")
-       ("vi" "Virgin Islands (U.S.)")
+       ("vg" "Virgin Islands, British")
+       ("vi" "Virgin Islands, U.S.")
        ("vn" "Vietnam")
        ("vu" "Vanuatu")
+       ("wf" "Wallis and Futuna")
+       ("ws" "Samoa")
+       ("ye" "Yemen")
+       ("yt" "Mayotte")
        ("yu" "Yugoslavia"       "Yugoslavia, AKA Serbia-Montenegro")
        ("za" "South Africa"     "The Republic of %s")
+       ("zm" "Zambia")
        ("zw" "Zimbabwe"         "Republic of %s")
        ;; Special top-level domains:
        ("arpa" t                "Advanced Research Projects Agency (U.S. DoD)")