Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 116-117)

   - Update from CVS

2006-07-18  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   [ Backported bug fixes from No Gnus. ]

   * lisp/gnus/nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
   (nnweb-google-search): Respect nnweb-max-hits as upper bound.
   (nnweb-request-article): Do proper xwfu encoding when fetching articles
   by message-id.

   * lisp/gnus/gnus-srvr.el (gnus-browse-unsubscribe-group): Don't subscribe
   unsubscribed groups as if they were killed ones.  It causes duplicate
   entries in gnus-newsrc-alist.

2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
   string.

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

4 files changed, 36 insertions, 12 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e443056e034..f05d0efbf87 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,21 @@
+2006-07-18  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        [ Backported bug fixes from No Gnus. ]
+
+        * nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
+        (nnweb-google-search): Respect nnweb-max-hits as upper bound.
+        (nnweb-request-article): Do proper xwfu encoding when fetching articles
+        by message-id.
+
+        * gnus-srvr.el (gnus-browse-unsubscribe-group): Don't subscribe
+        unsubscribed groups as if they were killed ones.  It causes duplicate
+        entries in gnus-newsrc-alist.
+
+2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
+        string.
+
 2006-07-16  NAKAJI Hiroyuki  <nakaji@heimat.jp>  (tiny change)
 
         * mm-util.el (mm-charset-synonym-alist): Map windows-31j to cp932.
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 5d4f9c2a3f6..aabf8efbf6b 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -943,19 +943,23 @@ If NUMBER, fetch this number of articles."
           (progn
             ;; Make sure the group has been properly removed before we
             ;; subscribe to it.
-            (gnus-kill-ephemeral-group group)
+            (if (gnus-ephemeral-group-p group)
+                (gnus-kill-ephemeral-group group))
+            ;; We need to discern between killed/zombie groups and
+            ;; just unsubscribed ones.
             (gnus-group-change-level
-             (list t group gnus-level-default-subscribed
-                   nil nil (if (gnus-server-equal
-                                gnus-browse-current-method "native")
-                               nil
-                             (gnus-method-simplify
-                              gnus-browse-current-method)))
+             (or (gnus-group-entry group)
+                 (list t group gnus-level-default-subscribed
+                       nil nil (if (gnus-server-equal
+                                    gnus-browse-current-method "native")
+                                   nil
+                                 (gnus-method-simplify
+                                  gnus-browse-current-method))))
              gnus-level-default-subscribed (gnus-group-level group)
              (and (car (nth 1 gnus-newsrc-alist))
                   (gnus-gethash (car (nth 1 gnus-newsrc-alist))
                                 gnus-newsrc-hashtb))
-             t)
+             (null (gnus-group-entry group)))
             (delete-char 1)
             (insert ? ))
         (gnus-group-change-level
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 66ab41950d1..b94d093329a 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9510,7 +9510,7 @@ deleted forever, right now."
 ;; Suggested by Jack Vinson <vinson@unagi.cis.upenn.edu>.
 (defun gnus-summary-delete-article (&optional n)
   "Delete the N next (mail) articles.
-This command actually deletes articles.  This is not a marking
+This command actually deletes articles.  This is not a marking
 command.  The article will disappear forever from your life, never to
 return.
 
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index a67d5a469f6..b4bba2aba0f 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -171,7 +171,8 @@ Valid types include `google', `dejanews', and `gmane'.")
                        (when (string-match "^<\\(.*\\)>$" article)
                          (setq art (match-string 1 article)))
                        (when (and fetch art)
-                         (setq url (format fetch art))
+                         (setq url (format fetch
+                                           (mm-url-form-encode-xwfu art)))
                          (mm-with-unibyte-current-buffer
                            (mm-url-insert url))
                          (if (nnweb-definition 'reference t)
@@ -365,7 +366,7 @@ Valid types include `google', `dejanews', and `gmane'.")
       (mm-url-decode-entities)
       (search-backward " - ")
       (when (looking-at
-             " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?, [^\n]+by \\([^<\n]+\\)\n")
+             " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?[^\n]+by ?\n?\\([^<\n]+\\)\n")
         (setq From (match-string 4)
               Date (format "%s %s 00:00:00 %s"
                            (match-string 1)
@@ -437,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" . "")