gnus-start.el (gnus-activate-group): Take an optional parameter to say that you don't want to call gnus-request-group with don-check, but do check the reponse. This is for virtual groups only.

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0a6c76a1d2d..419c26a02dc 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * gnus-start.el (gnus-activate-group): Take an optional parameter to
+        say that you don't want to call gnus-request-group with don-check, but
+        do check the reponse.  This is for virtual groups only.
+
         * nnimap.el (nnimap-request-list): Servers may return \NoSelect
         case-insensitively.
         (nnimap-debug): Removed.
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index c3c7241b3c3..f99a1dcd929 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1526,7 +1526,8 @@ newsgroup."
           (when (> (cdr cache-active) (cdr active))
             (setcdr active (cdr cache-active))))))))
 
-(defun gnus-activate-group (group &optional scan dont-check method)
+(defun gnus-activate-group (group &optional scan dont-check method
+                                  dont-sub-check)
   "Check whether a group has been activated or not.
 If SCAN, request a scan of that group as well."
   (let ((method (or method (inline (gnus-find-method-for-group group))))
@@ -1541,9 +1542,11 @@ If SCAN, request a scan of that group as well."
                 (gnus-request-scan group method))
            t)
          (if (or debug-on-error debug-on-quit)
-             (inline (gnus-request-group group dont-check method))
+             (inline (gnus-request-group group (or dont-sub-check dont-check)
+                                         method))
            (condition-case nil
-               (inline (gnus-request-group group dont-check method))
+               (inline (gnus-request-group group (or dont-sub-check dont-check)
+                                           method))
              ;;(error nil)
              (quit
               (message "Quit activating %s" group)
@@ -1796,7 +1799,7 @@ If SCAN, request a scan of that group as well."
       (gnus-read-active-file-1 method nil))
      (t
       (dolist (info infos)
-        (gnus-activate-group (gnus-info-group info) nil t method))))))
+        (gnus-activate-group (gnus-info-group info) nil nil method t))))))
 
 ;; Create a hash table out of the newsrc alist.  The `car's of the
 ;; alist elements are used as keys.