Mercurial > emacs
diff lisp/gnus/nnweb.el @ 90776:dd7c098af727
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 638-652)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 202)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 26 Feb 2007 23:03:45 +0000 |
| parents | 52a7f3f50b89 73e575b86f8a |
| children | f55f9811f5d7 |
line wrap: on
line diff
--- a/lisp/gnus/nnweb.el Fri Feb 23 06:03:48 2007 +0000 +++ b/lisp/gnus/nnweb.el Mon Feb 26 23:03:45 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)