From aa260d631b3cbe96057a6b5e63cd226d3b03c638 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Mon, 19 Feb 2007 00:49:13 +0000 Subject: [PATCH] Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 202) - Update from CVS 2007-02-15 Andreas Seltenreich * 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 --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnweb.el | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4b205529303..c6205eac0ce 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2007-02-15 Andreas Seltenreich + + * 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 * smiley.el (smiley-regexp-alist): Add "dead" smiley. diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el index 0f8df57d591..92d90eb061f 100644 --- 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) -- 2.39.2