diff options
author | Miles Bader <miles@gnu.org> | 2007-02-19 00:49:13 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-02-19 00:49:13 +0000 |
commit | aa260d631b3cbe96057a6b5e63cd226d3b03c638 (patch) | |
tree | ab987ddf4c973c3cc12fe742eaee69199aeaeeef /lisp/gnus/nnweb.el | |
parent | 700b8e66472752e3709bf3cae08cc82be70432a7 (diff) | |
download | emacs-aa260d631b3cbe96057a6b5e63cd226d3b03c638.tar.gz |
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
Diffstat (limited to 'lisp/gnus/nnweb.el')
-rw-r--r-- | lisp/gnus/nnweb.el | 14 |
1 files changed, 8 insertions, 6 deletions
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) |