diff options
| author | Gnus developers <ding@gnus.org> | 2010-10-14 10:16:59 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-14 10:16:59 +0000 |
| commit | 0d2d1bdcf33695592726c77c88d9d306f9e1d189 (patch) | |
| tree | b70866eaa6d52abdaa8a198923ff83c71e668699 /lisp/gnus/gnus-group.el | |
| parent | de43f11b3670d9a5776d9df6127ff12302e1fe65 (diff) | |
| download | emacs-0d2d1bdcf33695592726c77c88d9d306f9e1d189.tar.gz emacs-0d2d1bdcf33695592726c77c88d9d306f9e1d189.tar.bz2 emacs-0d2d1bdcf33695592726c77c88d9d306f9e1d189.zip | |
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.
Diffstat (limited to 'lisp/gnus/gnus-group.el')
| -rw-r--r-- | lisp/gnus/gnus-group.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 8c5d6e55f6c..0d047133cd0 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1548,7 +1548,7 @@ if it is a string, only list groups matching REGEXP." ?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 |