Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-155

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 36)

   - Update from CVS

2005-03-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/message.el: Don't autoload former message-utils variables.
   (message-strip-subject-trailing-was): Changed doc string.

   * lisp/gnus/nnweb.el: Fixes for `gnus-group-make-web-group'.
   (nnweb-type-definition): Don't add "hl=en" in `address'.  Added
   `base'.
   (nnweb-google-search): Add "hl=en" here.
   (nnweb-google-parse-1, nnweb-google-create-mapping): Don't
   hardcode URL.

1 files changed, 7 insertions, 5 deletions

diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index e5d6568a95c..89a4a739792 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -58,7 +58,8 @@ Valid types include `google', `dejanews', and `gmane'.")
      (reference . identity)
      (map . nnweb-google-create-mapping)
      (search . nnweb-google-search)
-     (address . "http://groups.google.de/groups?hl=en")
+     (address . "http://groups.google.de/groups")
+     (base    . "http://groups.google.de")
      (identifier . nnweb-google-identity))
     (dejanews ;; alias of google
      (article . ignore)
@@ -67,6 +68,7 @@ Valid types include `google', `dejanews', and `gmane'.")
      (map . nnweb-google-create-mapping)
      (search . nnweb-google-search)
      (address . "http://groups.google.com/groups")
+     (base    . "http://groups.google.com")
      (identifier . nnweb-google-identity))
     (gmane
      (article . nnweb-gmane-wash-article)
@@ -349,7 +351,7 @@ Valid types include `google', `dejanews', and `gmane'.")
 	    "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t)
       (setq mid (match-string 2)
 	    url (format
-		 "http://groups.google.com/groups?selm=%s&output=gplain" mid))
+		 (nnweb-definition 'id) mid))
       (narrow-to-region (search-forward ">" nil t)
 			(search-forward "</a>" nil t))
       (mm-url-remove-markup)
@@ -420,7 +422,7 @@ Valid types include `google', `dejanews', and `gmane'.")
 		    (>= i nnweb-max-hits))
 		(setq more nil)
 	      ;; Yup, there are more articles
-	      (setq more (concat "http://groups.google.com" (match-string 1)))
+	      (setq more (concat (nnweb-definition 'base) (match-string 1)))
 	    (when more
 	      (erase-buffer)
 	      (mm-url-insert more))))
@@ -435,9 +437,9 @@ Valid types include `google', `dejanews', and `gmane'.")
     "?"
     (mm-url-encode-www-form-urlencoded
      `(("q" . ,search)
-       ("num". "100")
+       ("num" . "100")
        ("hq" . "")
-       ("hl" . "")
+       ("hl" . "en")
        ("lr" . "")
        ("safe" . "off")
        ("sites" . "groups")))))