Mercurial > emacs
changeset 75678:17f71e8e8472
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 200-201)
- Merge from emacs--devo--0
- Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
2007-02-01 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* lisp/gnus/nnweb.el (nnweb-google-parse-1): Update parser.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-629
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 05 Feb 2007 05:37:56 +0000 |
| parents | 459c3d0ca3f8 |
| children | 7a4a95a4764f |
| files | lisp/gnus/ChangeLog lisp/gnus/nnweb.el |
| diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sun Feb 04 23:49:41 2007 +0000 +++ b/lisp/gnus/ChangeLog Mon Feb 05 05:37:56 2007 +0000 @@ -1,3 +1,7 @@ +2007-02-01 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * nnweb.el (nnweb-google-parse-1): Update parser. + 2007-01-29 Juanma Barranquero <lekktu@gmail.com> * gnus-art.el (gnus-button-prefer-mid-or-mail): Fix typo in docstring.
--- a/lisp/gnus/nnweb.el Sun Feb 04 23:49:41 2007 +0000 +++ b/lisp/gnus/nnweb.el Mon Feb 05 05:37:56 2007 +0000 @@ -360,23 +360,22 @@ (goto-char (point-max)) (widen) (narrow-to-region (point) - (search-forward "</td" nil t)) + (search-forward "</table" nil t)) (mm-url-remove-markup) (mm-url-decode-entities) - (search-backward " - ") - (when (looking-at - "\\W+\\(\\w+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?") + (goto-char (point-max)) + (when + (re-search-backward + "^\\(\\w+\\) \\([0-9]+\\)\\(?: \\([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)))) - (goto-char (match-end 0))) - (when (looking-at "[^b]+by\\W+\\([^<\n]+\\)") - (setq From (match-string 1))) + (setq From (match-string 4))) (widen) - (forward-line 1) (incf i) (unless (nnweb-get-hashtb url) (push