Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

2006-07-31  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
   Make it more robust by parsing author and date independently.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-185

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bb1cd8..0d93471 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,11 @@
 
        * nnheader.el (nnheader-insert-head): Fix typo in comment.
 
+2006-07-31  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
+       Make it more robust by parsing author and date independently.
+
 2006-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnheader.el (nnheader-insert-head): Make it work with Mac as well.

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 9ddf240..00e4631 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -366,14 +366,15 @@ Valid types include `google', `dejanews', and `gmane'.")
       (mm-url-decode-entities)
       (search-backward " - ")
       (when (looking-at
-            " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?[^\n]+by ?\n?\\([^<\n]+\\)\n")
-       (setq From (match-string 4)
-             Date (format "%s %s 00:00:00 %s"
+            "\\W+\\(\\w+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?")
+       (setq Date (format "%s %s 00:00:00 %s"
                           (match-string 1)
                           (match-string 2)
                           (or (match-string 3)
-                              (substring (current-time-string) -4)))))
-
+                              (substring (current-time-string) -4))))
+       (goto-char (match-end 0)))
+      (when (looking-at "[^b]+by\\W+\\([^<\n]+\\)")
+       (setq From (match-string 1)))
       (widen)
       (forward-line 1)
       (incf i)