Synch to No Gnus 200406210614.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3a0e78..df57854 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el (gnus-group-get-new-news-this-group): Don't call
+       gnus-activate-group twice.  Suggested by Markus Peter
+       <warp@spin.de>.
+
 2004-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-time-format): Exchange the order of

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 31a7f5f..b265d5e 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3686,14 +3686,15 @@ If DONT-SCAN is non-nil, scan non-activated groups as well."
       ;; Bypass any previous denials from the server.
       (gnus-remove-denial (setq method (gnus-find-method-for-group group)))
       (if (gnus-activate-group group (if dont-scan nil 'scan) nil method)
-         (progn
-           (gnus-get-unread-articles-in-group
-            (gnus-get-info group) (gnus-active group) t)
+         (let ((info (gnus-get-info group))
+               (active (gnus-active group)))
+           (gnus-request-update-info info method)
+           (gnus-get-unread-articles-in-group info active)
            (unless (gnus-virtual-group-p group)
              (gnus-close-group group))
            (when gnus-agent
              (gnus-agent-save-group-info
-              method (gnus-group-real-name group) (gnus-active group)))
+              method (gnus-group-real-name group) active))
            (gnus-group-update-group group))
        (if (eq (gnus-server-status (gnus-find-method-for-group group))
                'denied)