(mail-extr-all-top-level-domains): More domains.

1 files changed, 23 insertions, 8 deletions

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 27bdd8b3fc5..f4e5414adff 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1849,15 +1849,18 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
                (nth 1 x)))))
      '(
        ;; ISO 3166 codes:
+       ("ad" "Andorra")
        ("ae" "United Arab Emirates")
        ("ag" "Antigua and Barbuda")
        ("al" "Albania")
+       ("am" "Armenia")
        ("ao" "Angola")
        ("aq" "Antarctica")              ; continent
        ("ar" "Argentina"        "Argentine Republic")
        ("at" "Austria"          "The Republic of %s")
        ("au" "Australia")
        ("az" "Azerbaijan")
+       ("ba" "Bosnia-Herzegovina")
        ("bb" "Barbados")
        ("bd" "Bangladesh")
        ("be" "Belgium"          "The Kingdom of %s")
@@ -1894,31 +1897,37 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("eg" "Egypt"            "The Arab Republic of %s")
        ("er" "Eritrea")
        ("es" "Spain"            "The Kingdom of %s")
+       ("et" "Ethiopia")
        ("fi" "Finland"          "The Republic of %s")
-       ("fj" "Fiji")
        ("fo" "Faroe Islands")
        ("fr" "France")
-       ("gb" "Great Britain")
+       ("ga" "Gabon")
+       ("gb" "United Kingdom")
        ("gd" "Grenada")
        ("ge" "Georgia")
        ("gf" "Guyana (Fr.)")
+       ("gj" "Fiji")
+       ("gl" "Greenland")
+       ("gm" "Gambia")
        ("gp" "Guadeloupe (Fr.)")
        ("gr" "Greece"           "The Hellenic Republic (%s)")
        ("gt" "Guatemala")
        ("gu" "Guam (U.S.)")
        ("hk" "Hong Kong")
        ("hn" "Honduras")
-       ("hr" "Croatia")
+       ("hr" "Croatia"          "Croatia (Hrvatska)")
        ("ht" "Haiti")
-       ("hu" "Hungary"          "The Hungarian Republic")       ;???
+       ("hu" "Hungary"          "The Hungarian Republic")
        ("id" "Indonesia")
        ("ie" "Ireland")
        ("il" "Israel"           "The State of %s")
+       ("im" "Isle of Man"      "The %s")
        ("in" "India"            "The Republic of %s")
        ("ir" "Iran")
        ("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")
@@ -1935,13 +1944,15 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("lu" "Luxembourg")
        ("lv" "Latvia")
        ("ma" "Morocco")
-       ("md" "Moldova")
+       ("mc" "Monaco")
+       ("md" "Moldova"          "The Republic of %s")
        ("mg" "Madagascar")
        ("mk" "Macedonia")
        ("ml" "Mali")
        ("mo" "Macau")
        ("mt" "Malta")
        ("mu" "Mauritius")
+       ("mv" "Maldives")
        ("mw" "Malawi")
        ("mx" "Mexico"           "The United Mexican States")
        ("my" "Malaysia"         "%s (changed to Myanmar?)")             ;???
@@ -1953,6 +1964,7 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("nl" "Netherlands"      "The Kingdom of the %s")
        ("no" "Norway"           "The Kingdom of %s")
        ("np" "Nepal")                   ; Via .in domain
+       ("nu" "Niue")
        ("nz" "New Zealand")
        ("pa" "Panama")
        ("pe" "Peru")
@@ -1964,6 +1976,7 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("pr" "Puerto Rico (U.S.)")
        ("pt" "Portugal"         "The Portuguese Republic")
        ("py" "Paraguay")
+       ("qa" "Qatar")
        ("re" "Reunion (Fr.)")           ; In .fr domain
        ("ro" "Romania")
        ("ru" "Russian Federation")
@@ -1975,14 +1988,16 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("si" "Slovenia")
        ("sj" "Svalbard and Jan Mayen Is.") ; In .no domain
        ("sk" "Slovakia"         "The Slovak Republic")
+       ("sm" "San Marino")
        ("sn" "Senegal")
        ("sr" "Suriname")
-       ("su" "Soviet Union")
+       ("su" "U.S.S.R."         "The Union of Soviet Socialist Republics")
        ("sz" "Swaziland")
        ("tg" "Togo")
        ("th" "Thailand"         "The Kingdom of %s")
        ("tm" "Turkmenistan")            ; In .su domain
        ("tn" "Tunisia")
+       ("to" "Tonga")
        ("tr" "Turkey"           "The Republic of %s")
        ("tt" "Trinidad and Tobago")
        ("tw" "Taiwan")
@@ -1995,8 +2010,8 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
        ("vi" "Virgin Islands (U.S.)")
        ("vn" "Vietnam")
        ("vu" "Vanuatu")
-       ("yu" "Yugoslavia"       "The Socialist Federal Republic of %s")
-       ("za" "South Africa"     "The Republic of %s (or Zambia? Zaire?)")
+       ("yu" "Yugoslavia"       "Yugoslavia, AKA Serbia-Montenegro")
+       ("za" "South Africa"     "The Republic of %s")
        ("zw" "Zimbabwe"         "Republic of %s")
        ;; Special top-level domains:
        ("arpa" t                "Advanced Research Projects Agency (U.S. DoD)")