[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-srvr.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     06/07/19 01:06:00

Index: gnus-srvr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-srvr.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnus-srvr.el        5 Feb 2006 13:56:44 -0000       1.22
+++ gnus-srvr.el        19 Jul 2006 01:06:00 -0000      1.23
@@ -943,19 +943,23 @@
          (progn
            ;; Make sure the group has been properly removed before we
            ;; subscribe to it.
-           (gnus-kill-ephemeral-group group)
+           (if (gnus-ephemeral-group-p group)
+               (gnus-kill-ephemeral-group group))
+           ;; We need to discern between killed/zombie groups and
+           ;; just unsubscribed ones.
            (gnus-group-change-level
+            (or (gnus-group-entry group)
             (list t group gnus-level-default-subscribed
                   nil nil (if (gnus-server-equal
                                gnus-browse-current-method "native")
                               nil
                             (gnus-method-simplify
-                             gnus-browse-current-method)))
+                                 gnus-browse-current-method))))
             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)
+            (null (gnus-group-entry group)))
            (delete-char 1)
            (insert ? ))
        (gnus-group-change-level