Mercurial > emacs
diff lisp/gnus/gnus-group.el @ 110995:29c951d93e6d
Merge changes made in Gnus trunk.
gnus-group.el (gnus-group-insert-group-line): Fix group argument to `gnus-group-get-icon'.
nnimap.el (nnimap-open-connection): tls-program should be a list of programs.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 14 Oct 2010 10:16:59 +0000 |
parents | 236342431786 |
children | fc6dc700cc9f |
line wrap: on
line diff
--- a/lisp/gnus/gnus-group.el Thu Oct 14 01:57:58 2010 -0400 +++ b/lisp/gnus/gnus-group.el Thu Oct 14 10:16:59 2010 +0000 @@ -1548,7 +1548,7 @@ ?m ? )) (gnus-tmp-moderated-string (if (eq gnus-tmp-moderated ?m) "(m)" "")) - (gnus-tmp-group-icon (gnus-group-get-icon gnus-tmp-qualified-group)) + (gnus-tmp-group-icon (gnus-group-get-icon gnus-tmp-group)) (gnus-tmp-news-server (or (cadr gnus-tmp-method) "")) (gnus-tmp-news-method (or (car gnus-tmp-method) "")) (gnus-tmp-news-method-string