2000-10-29 09:42:05 ShengHuo ZHU <zsh@cs.rochester.edu>
authorShengHuo ZHU <zsh@cs.rochester.edu>
Sun, 29 Oct 2000 13:45:20 +0000 (13:45 +0000)
committerShengHuo ZHU <zsh@cs.rochester.edu>
Sun, 29 Oct 2000 13:45:20 +0000 (13:45 +0000)
* gnus-srvr.el (gnus-browse-foreign-server): Show level mark.
(gnus-browse-unsubscribe-group): Unsubscribed is not killed.

lisp/ChangeLog
lisp/gnus-srvr.el

index aa81373..9ef9b5a 100644 (file)
@@ -1,3 +1,8 @@
+2000-10-29 09:42:05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-srvr.el (gnus-browse-foreign-server): Show level mark.
+       (gnus-browse-unsubscribe-group): Unsubscribed is not killed.
+
 2000-10-29 08:28:58  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnfolder.el (nnfolder-read-folder): Don't goto point-min.
index f1224c9..87155e7 100644 (file)
@@ -634,7 +634,16 @@ The following commands are available:
           (point)
           (prog1 (1+ (point))
             (insert
-             (format "K%7d: %s\n" (cdr group)
+             (format "%c%7d: %s\n" 
+                     (let ((level
+                            (gnus-group-level
+                             (gnus-group-prefixed-name (car group) method))))
+                       (cond 
+                        ((<= level gnus-level-subscribed) ? )
+                        ((<= level gnus-level-unsubscribed) ?U)
+                        ((= level gnus-level-zombie) ?Z)
+                        (t ?K)))
+                     (cdr group)
                      (gnus-group-name-decode (car group) charset))))
           (list 'gnus-group (car group)))
          (setq groups (cdr groups))))
@@ -739,13 +748,13 @@ buffer.
     (save-excursion
       (beginning-of-line)
       ;; If this group it killed, then we want to subscribe it.
-      (when (eq (char-after) ?K)
+      (unless (eq (char-after) ? )
        (setq sub t))
       (setq group (gnus-browse-group-name))
-      (when (and sub
-                (cadr (gnus-gethash group gnus-newsrc-hashtb)))
-       (error "Group already subscribed"))
-      (delete-char 1)
+      ;;;;
+      ;;(when (and sub
+      ;;                (cadr (gnus-gethash group gnus-newsrc-hashtb)))
+      ;;(error "Group already subscribed"))
       (if sub
          (progn
            ;; Make sure the group has been properly removed before we
@@ -758,15 +767,17 @@ buffer.
                               nil
                             (gnus-method-simplify 
                              gnus-browse-current-method)))
-            gnus-level-default-subscribed gnus-level-killed
+            gnus-level-default-subscribed (gnus-group-level group)
             (and (car (nth 1 gnus-newsrc-alist))
                  (gnus-gethash (car (nth 1 gnus-newsrc-alist))
                                gnus-newsrc-hashtb))
             t)
+           (delete-char 1)
            (insert ? ))
        (gnus-group-change-level
-        group gnus-level-killed gnus-level-default-subscribed)
-       (insert ?K)))
+        group gnus-level-unsubscribed gnus-level-default-subscribed)
+       (delete-char 1)
+       (insert ?U)))
     t))
 
 (defun gnus-browse-exit ()