* message.el (message-valid-fqdn-regexp): Add TLDs .cat, jobs,

.mobi and .travel.  Remove .nato, .bitnet and .uucp.

* message.el (message-citation-line-format): New variable.
(message-insert-formated-citation-line): New function.
(message-citation-line-function): Add
`message-insert-formated-citation-line' to custom type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97808ed..f7667fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * message.el (message-valid-fqdn-regexp): Add TLDs .cat, jobs,
+       .mobi and .travel.  Remove .nato, .bitnet and .uucp.
+
        * mml.el: Simplify autoload.
        (mml-mode): defvar dnd-protocol-alist instead of using
        symbol-value.

diff --git a/lisp/message.el b/lisp/message.el
index d3a9388..f648f2b 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1686,10 +1686,15 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
   (concat "[a-z0-9][-.a-z0-9]+\\." ;; [hostname.subdomain.]domain.
          ;; valid TLDs:
          "\\([a-z][a-z]" ;; two letter country TDLs
-         "\\|biz\\|com\\|edu\\|gov\\|int\\|mil\\|net\\|org"
-         "\\|aero\\|coop\\|info\\|name\\|museum"
-         "\\|arpa\\|pro\\|uucp\\|bitnet\\|bofh" ;; old style?
-         "\\)")
+         "aero\\|arpa\\|bitnet\\|biz\\|bofh\\|"
+         "cat\\|com\\|coop\\|edu\\|gov\\|"
+         "info\\|int\\|jobs\\|"
+         "mil\\|mobi\\|museum\\|name\\|net\\|"
+         "org\\|pro\\|travel\\|uucp\\)")
+  ;; http://en.wikipedia.org/wiki/List_of_Internet_top-level_domains
+  ;; http://en.wikipedia.org/wiki/GTLD
+  ;; `in the process of being approved': .asia .post .tel .sex
+  ;; "dead" nato bitnet uucp
   "Regular expression that matches a valid FQDN."
   ;; see also: gnus-button-valid-fqdn-regexp
   :version "22.1"