From: Miles Bader <miles@gnu.org>
Date: Mon, 5 Feb 2007 05:37:56 +0000 (+0000)
Subject: Merge from gnus--rel--5.10
X-Git-Tag: emacs-pretest-22.0.94~387
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c91f4b83104c5b56a6937361c533f3944e277a0b;p=emacs.git

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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ddc604c6b5d..5d4457e325c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 088aeee3bd5..0f8df57d591 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -360,23 +360,22 @@ Valid types include `google', `dejanews', and `gmane'.")
       (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