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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 76-77)

   - Update from CVS: README: Addition from 5.10.6 tar ball.
   - Update from CVS

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d39ab0a..6f6e150 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-04  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-google-create-mapping): Update regexp.  Some
+       whitespace was matched into the url, which broke browsing hits
+       > 100 when mm-url-use-external was nil.
+
 2006-03-31  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-group.el (gnus-group-update-tool-bar): Add :initialize and

diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 13901e2..134b62e 100644 (file)
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -415,7 +415,7 @@ Valid types include `google', `dejanews', and `gmane'.")
            (goto-char (point-min))
            (incf i 100)
            (if (or (not (re-search-forward
-                         "<a href=\"\n\\([^>\"]+\\)\"><img src=\"[^\"]+next"
+                         "<a href=\"\n\\([^>\" \n\t]+\\)[^<]*<img src=[^>]+next"
                          nil t))
                    (>= i nnweb-max-hits))
                (setq more nil)