Mercurial > emacs
changeset 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 | 80c672780889 |
| children | e65b79c36e50 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-group.el lisp/gnus/nnimap.el |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Oct 14 01:57:58 2010 -0400 +++ b/lisp/gnus/ChangeLog Thu Oct 14 10:16:59 2010 +0000 @@ -1,3 +1,13 @@ +2010-10-14 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * nnimap.el (nnimap-open-connection): tls-program should be a list of + programs. + +2010-10-14 Julien Danjou <julien@danjou.info> + + * gnus-group.el (gnus-group-insert-group-line): Fix group argument to + `gnus-group-get-icon'. + 2010-10-13 Lars Magne Ingebrigtsen <larsi@gnus.org> * nnimap.el (nnimap-close-server): Forget the nnimap data on close.
--- 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
--- a/lisp/gnus/nnimap.el Thu Oct 14 01:57:58 2010 -0400 +++ b/lisp/gnus/nnimap.el Thu Oct 14 10:16:59 2010 +0000 @@ -318,7 +318,8 @@ (setq port (or nnimap-server-port "imap"))) '("imap")) ((eq nnimap-stream 'starttls) - (let ((tls-program "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof -starttls imap")) + (let ((tls-program + '("openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof -starttls imap"))) (open-tls-stream "*nnimap*" (current-buffer) nnimap-address (setq port (or nnimap-server-port "imap"))))