Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

2007-02-15  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/gnus/nnweb.el (nnweb-google-parse-1): Fix date parsing to also match on
   articles posted in the last 24 hours.

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4b205529303870e93684b025530fbc4d3399435a..c6205eac0ce2e4dc001ec39aee7d80e45b92ebbe 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-15  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-google-parse-1): Fix date parsing to also match on
+       articles posted in the last 24 hours.
+
 2007-02-14  Chong Yidong  <cyd@stupidchicken.com>
 
        * smiley.el (smiley-regexp-alist): Add "dead" smiley.

diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 0f8df57d5916727aa9f4f57042e9d1bfd21fcd5a..92d90eb061fba35c07b905c7b467f2b16a2e7938 100644 (file)
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -367,13 +367,15 @@ Valid types include `google', `dejanews', and `gmane'.")
       (goto-char (point-max))
       (when
          (re-search-backward
-          "^\\(\\w+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)? by \\(.*\\)"
+          "^\\(?:\\(\\w+\\) \\([0-9]+\\)\\|\\S-+\\)\\(?: \\([0-9]\\{4\\}\\)\\)? by \\(.*\\)"
           nil t)
-       (setq Date (format "%s %s 00:00:00 %s"
-                          (match-string 1)
-                          (match-string 2)
-                          (or (match-string 3)
-                              (substring (current-time-string) -4))))
+       (setq Date (if (match-string 1)
+                      (format "%s %s 00:00:00 %s"
+                              (match-string 1)
+                              (match-string 2)
+                              (or (match-string 3)
+                                  (substring (current-time-string) -4)))
+                    (current-time-string)))
        (setq From (match-string 4)))
       (widen)
       (incf i)