2000-10-30 08:17:46 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus.el (gnus-server-browse-hashtb): Removed.
	* gnus-group.el (gnus-group-prepare-flat-list-dead): Use gnus-active.
	(gnus-group-insert-group-line-info): Use simplified method.
	* gnus-srvr.el (gnus-browse-foreign-server): Use gnus-set-active.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f82b68..c2db858 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-30 08:17:46  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.el (gnus-server-browse-hashtb): Removed.
+       * gnus-group.el (gnus-group-prepare-flat-list-dead): Use gnus-active.
+       (gnus-group-insert-group-line-info): Use simplified method.
+       * gnus-srvr.el (gnus-browse-foreign-server): Use gnus-set-active.
+
 2000-10-30 01:52:40  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-util.el (gnus-union): Renamed from gnus-agent-union, and

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index dae9dfa..6ab0e9b 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1146,8 +1146,12 @@ if it is a string, only list groups matching REGEXP."
 ;;;           'gnus-level level))
        (gnus-group-insert-group-line 
         group level nil
-        (if gnus-server-browse-hashtb
-            (gnus-gethash group gnus-server-browse-hashtb) t)
+        (let ((active (gnus-active group)))
+          (if active
+              (if (zerop (cdr active))
+                  0
+                (- (1+ (cdr active)) (car active)))
+            nil))
         (gnus-method-simplify (gnus-find-method-for-group group)))))))
 
 (defun gnus-group-update-group-line ()
@@ -1191,7 +1195,7 @@ if it is a string, only list groups matching REGEXP."
               0
             (- (1+ (cdr active)) (car active)))
         nil)
-       nil))))
+       (gnus-method-simplify (gnus-find-method-for-group group))))))
 
 (defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level
                                                    gnus-tmp-marked number

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index b217086..eb31093 100644 (file)
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -618,7 +618,8 @@ The following commands are available:
                           (setq name (concat name (buffer-substring
                                                    p (point)))))
                         name))
-                    (max 0 (- (1+ (read cur)) (read cur))))
+                    (let ((last (read cur)))
+                      (cons (read cur) last)))
                    groups))
            (forward-line))))
       (setq groups (sort groups
@@ -626,15 +627,12 @@ The following commands are available:
                           (string< (car l1) (car l2)))))
       (if gnus-server-browse-in-group-buffer
          (let* ((gnus-select-method orig-select-method)
-                (gnus-server-browse-hashtb 
-                 (gnus-make-hashtable (length groups)))
                 (gnus-group-listed-groups 
                  (mapcar (lambda (group) 
                            (let ((name
                                   (gnus-group-prefixed-name 
                                    (car group) method)))
-                             (gnus-sethash name (cdr group)
-                                           gnus-server-browse-hashtb)
+                             (gnus-set-active name (cdr group))
                              name))
                          groups)))
            (gnus-configure-windows 'group)
@@ -669,7 +667,7 @@ The following commands are available:
                         ((<= level gnus-level-unsubscribed) ?U)
                         ((= level gnus-level-zombie) ?Z)
                         (t ?K)))
-                       (cdr group)
+                       (max 0 (- (1+ (cddr group)) (cadr group)))
                        (gnus-group-name-decode (car group) charset))))
             (list 'gnus-group (car group)))
            (setq groups (cdr groups))))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 256f108..ea3723e 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1636,9 +1636,6 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
 (defvar gnus-moderated-hashtb nil
   "Hashtable of moderated newsgroups.")
 
-(defvar gnus-server-browse-hashtb nil
-  "Hashtable of existing articles.")
-
 ;; Save window configuration.
 (defvar gnus-prev-winconf nil)