Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 619, 621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * 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/nnweb.el (nnweb-google-parse-1): Update parser.

2007-01-29  Juanma Barranquero  <lekktu@gmail.com>

   * lisp/gnus-art.el (gnus-button-prefer-mid-or-mail): Fix typo in docstring.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-286

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1064b20..9b28e76 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * nnslashdot.el (nnslashdot-request-article): Update end-of-article

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 41d845d..9e45350 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6566,7 +6566,7 @@ Strings like this can be either a message ID or a mail address.  If it is one
 of the symbols `mid' or `mail', Gnus will always assume that the string is a
 message ID or a mail address, respectively.  If this variable is set to the
 symbol `ask', always query the user what do do.  If it is a function, this
-function will be called with the string as it's only argument.  The function
+function will be called with the string as its only argument.  The function
 must return `mid', `mail', `invalid' or `ask'."
   :version "22.1"
   :group 'gnus-article-buttons

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index f79523f..a89e597 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/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