Mercurial > emacs
changeset 76001:73e575b86f8a
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 19 Feb 2007 00:49:13 +0000 |
| parents | 8d61685ee62b |
| children | 8c6a6255b5e1 |
| files | lisp/gnus/ChangeLog lisp/gnus/nnweb.el |
| diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sun Feb 18 20:36:06 2007 +0000 +++ b/lisp/gnus/ChangeLog Mon Feb 19 00:49:13 2007 +0000 @@ -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.
--- a/lisp/gnus/nnweb.el Sun Feb 18 20:36:06 2007 +0000 +++ b/lisp/gnus/nnweb.el Mon Feb 19 00:49:13 2007 +0000 @@ -367,13 +367,15 @@ (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)