*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d22892..882829e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,18 @@
+Sun Apr  7 20:14:50 1996  Lars Magne Ingebrigtsen  <lars@eyesore.no>
+
+       * gnus.el (gnus-group-get-new-news-this-group): Would update
+       groups twice.
+
+       * gnus-cache.el (gnus-cache-possibly-enter-article): Use real
+       group name.
+
+       * nnvirtual.el (nnvirtual-possibly-change-group): Faulty logic.
+       (nnvirtual-retrieve-headers): Don't force re-check.
+
 Sun Apr  7 01:11:57 1996  Lars Magne Ingebrigtsen  <lars@eyesore.no>
 
+       * gnus.el: September Gnus v0.66 is released.
+
        * nnvirtual.el (nnvirtual-close-group): Don't nix out
        group-relevant variables.
 

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index ab12b0e..480815f 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -116,7 +116,8 @@ variable to \"^nnml\".")
             (vectorp headers)) ; This might be a dummy article.
     ;; If this is a virtual group, we find the real group.
     (when (gnus-virtual-group-p group)
-      (let ((result (nnvirtual-find-group-art group article)))
+      (let ((result (nnvirtual-find-group-art 
+                    (gnus-group-real-name group) article)))
        (setq group (car result)
              article (cdr result)
              headers (copy-sequence headers))
@@ -195,7 +196,7 @@ variable to \"^nnml\".")
          ga)
       (while arts
        (when (setq ga (nnvirtual-find-group-art
-                       gnus-newsgroup-name (pop arts)))
+                       (gnus-group-real-name gnus-newsgroup-name) (pop arts)))
          (let ((gnus-cache-removable-articles (list (cdr ga)))
                (gnus-newsgroup-name (car ga)))
            (gnus-cache-possibly-remove-articles-1)))))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index d25fbde..760d9a3 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1695,7 +1695,7 @@ variable (string, integer, character, etc).")
   "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version "September Gnus v0.66"
+(defconst gnus-version "September Gnus v0.67"
   "Version number for this version of Gnus.")
 
 (defvar gnus-info-nodes
@@ -15486,7 +15486,7 @@ newsgroup."
     (when (and update 
               (gnus-request-update-info
                info (gnus-find-method-for-group (gnus-info-group info))))
-      (gnus-activate-group (gnus-info-group info)))
+      (gnus-activate-group (gnus-info-group info) nil t))
     (let* ((range (gnus-info-read info))
           (num 0))
       ;; If a cache is present, we may have to alter the active info.
@@ -15652,7 +15652,7 @@ newsgroup."
       (while list
        (gnus-sethash (car list) (pop list) gnus-killed-hashtb)))))
 
-(defun gnus-activate-group (group &optional scan)
+(defun gnus-activate-group (group &optional scan dont-check)
   ;; Check whether a group has been activated or not.
   ;; If SCAN, request a scan of that group as well.
   (let ((method (gnus-find-method-for-group group))
@@ -15667,7 +15667,7 @@ newsgroup."
                (gnus-request-scan group method))
           t)
         (condition-case ()
-            (gnus-request-group group)
+            (gnus-request-group group dont-check)
        ;   (error nil)
           (quit nil))
         (save-excursion

diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el
index 11e35f1..256d76b 100644 (file)
--- a/lisp/nnvirtual.el
+++ b/lisp/nnvirtual.el
@@ -62,7 +62,7 @@ virtual group.")
 ;;; Interface functions.
 
 (defun nnvirtual-retrieve-headers (articles &optional newsgroup server fetch-old)
-  (when (nnvirtual-possibly-change-group newsgroup server t)
+  (when (nnvirtual-possibly-change-group newsgroup server)
     (save-excursion
       (if (stringp (car articles))
          'headers
@@ -173,7 +173,7 @@ virtual group.")
   nnvirtual-status-string)
 
 (defun nnvirtual-request-article (article &optional group server buffer)
-  (when (and (nnvirtual-possibly-change-group group server t)
+  (when (and (nnvirtual-possibly-change-group group server)
             (numberp article))
     (let* ((amap (assq article nnvirtual-mapping))
           (cgroup (cadr amap)))
@@ -204,7 +204,7 @@ virtual group.")
       (nnheader-insert "211 %d 1 %d %s\n" len len group)))))
 
 (defun nnvirtual-request-type (group &optional article)
-  (when (nnvirtual-possibly-change-group group nil t)
+  (when (nnvirtual-possibly-change-group group nil)
     (if (not article)
        'unknown
       (let ((mart (assq article nnvirtual-mapping)))
@@ -212,7 +212,7 @@ virtual group.")
          (gnus-request-type (cadr mart) (car mart)))))))
 
 (defun nnvirtual-request-update-mark (group article mark)
-  (when (nnvirtual-possibly-change-group group nil t)
+  (when (nnvirtual-possibly-change-group group nil)
     (let* ((nart (assq article nnvirtual-mapping))
           (cgroup (cadr nart))
           ;; The component group might be a virtual group.
@@ -223,7 +223,7 @@ virtual group.")
   mark)
     
 (defun nnvirtual-close-group (group &optional server)
-  (when (nnvirtual-possibly-change-group group server t)
+  (when (nnvirtual-possibly-change-group group server)
     ;; Copy (un)read articles.
     (nnvirtual-update-reads)
     ;; We copy the marks from this group to the component
@@ -277,7 +277,7 @@ virtual group.")
       t)))
 
 (defun nnvirtual-catchup-group (group &optional server all)
-  (nnvirtual-possibly-change-group group server t)
+  (nnvirtual-possibly-change-group group server)
   (let ((gnus-group-marked nnvirtual-component-groups)
        (gnus-expert-user t))
     ;; Make sure all groups are activated.
@@ -292,7 +292,7 @@ virtual group.")
 
 (defun nnvirtual-find-group-art (group article)
   "Return the real group and article for virtual GROUP and ARTICLE."
-  (nnvirtual-possibly-change-group group nil t)
+  (nnvirtual-possibly-change-group group nil)
   (let ((mart (assq article nnvirtual-mapping)))
     (when mart
       (cons (cadr mart) (caddr mart)))))
@@ -325,38 +325,49 @@ virtual group.")
   (let ((inf t))
     (when (or (not (equal group nnvirtual-current-group))
              check)
-      (and (setq inf (assoc group nnvirtual-group-alist))
-          regexp
-          (string= (nth 3 inf) regexp)
-          (progn
-            (setq nnvirtual-current-group (car inf))
-            (setq nnvirtual-component-groups (nth 1 inf))
-            (setq nnvirtual-mapping (nth 2 inf))))
-      (when (and regexp (not inf))
-       (and inf (setq nnvirtual-group-alist 
-                      (delq inf nnvirtual-group-alist)))
+      (if check
+         ;; We nix out the variables.
+         (setq nnvirtual-current-group nil
+               nnvirtual-component-groups nil
+               nnvirtual-mapping nil
+               nnvirtual-group-alist
+               (delq (assoc group nnvirtual-group-alist)
+                     nnvirtual-group-alist))
+       (setq inf (assoc group nnvirtual-group-alist))
+       (when nnvirtual-current-group
+         ;; Push the old group variables onto the alist.
+         (setq nnvirtual-group-alist
+               (cons (list nnvirtual-current-group
+                           nnvirtual-component-groups
+                           nnvirtual-mapping)
+                     (delq inf nnvirtual-group-alist))))
+       (setq nnvirtual-current-group nil
+             nnvirtual-component-groups nil
+             nnvirtual-mapping nil)
+       ;; Try to find the variables in the assoc.
+       (when (and inf (equal (nth 3 inf) regexp))
+         (setq nnvirtual-current-group (car inf)
+               nnvirtual-component-groups (nth 1 inf)
+               nnvirtual-mapping (nth 2 inf))))
+      
+      (unless nnvirtual-component-groups
        (setq nnvirtual-mapping nil)
        (setq nnvirtual-current-group group)
-       (let ((newsrc gnus-newsrc-alist)
+       ;; Go through the newsrc alist and find all component groups.
+       (let ((newsrc (cdr gnus-newsrc-alist))
              (virt-group (gnus-group-prefixed-name 
                           nnvirtual-current-group '(nnvirtual ""))))
-         (setq nnvirtual-component-groups nil)
-         (while newsrc
-           (and (string-match regexp (caar newsrc))
-                (not (string= (caar newsrc) virt-group))
+         (while (setq group (car (pop newsrc)))
+           (and (string-match regexp group) ; Match
+                ;; Virtual groups shouldn't include itself.
+                (not (string= group virt-group))
+                ;; Add this group to the list of component groups.
                 (setq nnvirtual-component-groups
-                      (cons (caar newsrc) 
-                            (delete (caar newsrc)
-                                    nnvirtual-component-groups))))
-           (setq newsrc (cdr newsrc))))
-       (if nnvirtual-component-groups
-           (progn
-             (nnvirtual-create-mapping)
-             (setq nnvirtual-group-alist
-                   (cons (list group nnvirtual-component-groups 
-                               nnvirtual-mapping regexp)
-                         nnvirtual-group-alist)))
-         (nnheader-report 'nnvirtual "No component groups: %s" group)))))
+                      (cons group 
+                            (delete group nnvirtual-component-groups))))))
+       (if (not nnvirtual-component-groups)
+           (nnheader-report 'nnvirtual "No component groups: %s" group)
+         (nnvirtual-create-mapping)))))
   nnvirtual-component-groups)
 
 (defun nnvirtual-update-marked ()