X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-group.el;h=92af017d0eae8dc2e48d41987cd1fda54646e3da;hp=ccdbf498eca2b04b57eaea01e86feb1ecd47730f;hb=cd70301fa08903f2ec311c95429aed3adac4b80e;hpb=79a55ed7cad84f9cee85b4a052c453c1233d1bab

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index ccdbf498e..92af017d0 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1052,6 +1052,9 @@ if it is a string, only list groups matching REGEXP."
   (let ((buffer-read-only nil)
 	(newsrc (cdr gnus-newsrc-alist))
 	(lowest (or lowest 1))
+	(not-in-list (and gnus-group-listed-groups
+		       (not (eq gnus-group-list-option 'limit))
+		       (copy-sequence gnus-group-listed-groups)))
 	info clevel unread group params)
     (erase-buffer)
     (when (or (< lowest gnus-level-zombie)
@@ -1063,6 +1066,8 @@ if it is a string, only list groups matching REGEXP."
 	      params (gnus-info-params info)
 	      newsrc (cdr newsrc)
 	      unread (car (gnus-gethash group gnus-newsrc-hashtb)))
+	(if not-in-list 
+	    (setq not-in-list (delete group not-in-list)))
 	(and 
 	 (gnus-group-prepare-logic 
 	  group
@@ -1102,10 +1107,14 @@ if it is a string, only list groups matching REGEXP."
 	 (setq gnus-zombie-list (sort gnus-zombie-list 'string<))
 	 gnus-level-zombie ?Z
 	 regexp))
+    (if not-in-list 
+	(dolist (group gnus-zombie-list)
+	  (setq not-in-list (delete group not-in-list))))
     (if (or gnus-group-listed-groups
 	    (and (>= level gnus-level-killed) (<= lowest gnus-level-killed)))
 	(gnus-group-prepare-flat-list-dead
-	 (setq gnus-killed-list (sort gnus-killed-list 'string<))
+	 (or not-in-list
+	     (setq gnus-killed-list (sort gnus-killed-list 'string<)))
 	 gnus-level-killed ?K regexp))
 
     (gnus-group-set-mode-line)
@@ -1125,16 +1134,21 @@ if it is a string, only list groups matching REGEXP."
 	     (or (not regexp)
 		 (and (stringp regexp) (string-match regexp group))
 		 (and (functionp regexp) (funcall regexp group))))
-	(gnus-add-text-properties
-	 (point) (prog1 (1+ (point))
-		   (insert " " mark "     *: "
-			   (gnus-group-name-decode group 
-						   (gnus-group-name-charset
-						    nil group)) 
-			   "\n"))
-	 (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb)
-	       'gnus-unread t
-	       'gnus-level level))))))
+;;; 	(gnus-add-text-properties
+;;; 	 (point) (prog1 (1+ (point))
+;;; 		   (insert " " mark "     *: "
+;;; 			   (gnus-group-name-decode group 
+;;; 						   (gnus-group-name-charset
+;;; 						    nil group)) 
+;;; 			   "\n"))
+;;; 	 (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb)
+;;; 	       'gnus-unread t
+;;; 	       'gnus-level level))
+	(gnus-group-insert-group-line 
+	 group level nil
+	 (if gnus-server-browse-hashtb
+	     (gnus-gethash group gnus-server-browse-hashtb) t)
+	 (gnus-method-simplify (gnus-find-method-for-group group)))))))
 
 (defun gnus-group-update-group-line ()
   "Update the current line in the group buffer."