(elmo-mailing-list-name-spec-list): Merge entries

for `list-id'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index c32830f..ba61446 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-22  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-vars.el (elmo-mailing-list-name-spec-list): Merge entries
+       for `list-id'.
+
 2006-01-22  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * elmo-vars.el (elmo-mailing-list-name-spec-list): Fix list-id

diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 93af6ce..b580c94 100644 (file)
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -447,8 +447,7 @@ Arguments for this function are NAME, BUFFER, HOST and SERVICE.")
     (x-sequence "^\\([^ ]+\\)")
     (subject "^\\s(\\(\\S)+\\)[ :][0-9]+\\s)[ \t]*")
     (list-post "<mailto:\\(.+\\)@")
-    (list-id "<\\([^.]+\\)\\.")
-    (list-id "^\\([^.]+\\)\\.")
+    (list-id "<\\([^.]+\\)\\." "^\\([^.]+\\)\\.")
     (mailing-list ("\\(^\\|; \\)contact \\([^@]+\\)-[^-@]+@" . 2))
     (return-path "^<\\([^@>]+\\)-return-[0-9]+-")
     (delivered-to "^mailing list \\([^@]+\\)@"))