# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1170653876 0
# Node ID 17f71e8e847203974894368758a5766ab72de725
# Parent  459c3d0ca3f8dd2bda7410cbc92d9c0a85114a49
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

diff -r 459c3d0ca3f8 -r 17f71e8e8472 lisp/gnus/ChangeLog
--- 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.
diff -r 459c3d0ca3f8 -r 17f71e8e8472 lisp/gnus/nnweb.el
--- 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