Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71ba7cd..c402720 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -28,6 +28,9 @@
 
 2010-09-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-group.el (gnus-group-line-format-alist): Have the ?U (unseen)
+       spec inser "*" if the group isn't active instead of 0.
+
        * nnimap.el (nnimap-request-group): Don't select the imap buffer before
        opening the server.
        (nnimap-request-delete-group): Implement group deletion.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index fa6ae51..3e79b18 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -509,7 +509,10 @@ simple manner.")
                   (gnus-range-length (cdr (assq 'tick gnus-tmp-marked))))))
              (t number)) ?s)
     (?R gnus-tmp-number-of-read ?s)
-    (?U (gnus-number-of-unseen-articles-in-group gnus-tmp-group) ?d)
+    (?U (if (gnus-active gnus-tmp-group)
+           (gnus-number-of-unseen-articles-in-group gnus-tmp-group)
+         "*")
+       ?s)
     (?t gnus-tmp-number-total ?d)
     (?y gnus-tmp-number-of-unread ?s)
     (?I (gnus-range-length (cdr (assq 'dormant gnus-tmp-marked))) ?d)