* gnus.el (gnus-valid-select-methods): Declare nnweb with 'address.

Since revision 6.95 (2003-01-05) of gnus-group.el, solid web groups are
created using server names.  If we use the feature without declaring
it, Gnus does not properly manage server and group state.

* nnweb.el (nnweb-google-search): Respect nnweb-max-hits as upper
bound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42fd872..907e9cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * gnus.el (gnus-valid-select-methods): Declare nnweb with 'address.
+       Since revision 6.95 (2003-01-05) of gnus-group.el, solid web groups are
+       created using server names.  If we use the feature without declaring
+       it, Gnus does not properly manage server and group state.
+
+       * nnweb.el (nnweb-google-search): Respect nnweb-max-hits as upper
+       bound.
+
 2006-06-25  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * gnus.el (gnus-find-method-for-group): On killed/unknown groups, try

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 0db06f8..6fedd0d 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1667,7 +1667,7 @@ slower."
     ("nndraft" post-mail)
     ("nnfolder" mail respool address)
     ("nngateway" post-mail address prompt-address physical-address)
-    ("nnweb" none)
+    ("nnweb" address)
     ("nngoogle" post)
     ("nnslashdot" post)
     ("nnultimate" none)

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 10297dd..2f99d9d 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -438,7 +438,8 @@ Valid types include `google', `dejanews', and `gmane'.")
     "?"
     (mm-url-encode-www-form-urlencoded
      `(("q" . ,search)
-       ("num" . "100")
+       ("num" . ,(number-to-string
+                 (min 100 nnweb-max-hits)))
        ("hq" . "")
        ("hl" . "en")
        ("lr" . "")