# HG changeset patch # User Katsumi Yamaoka # Date 1287051419 0 # Node ID 29c951d93e6d02be869b2a40e67f21b2a6194f16 # Parent 80c672780889534890b80503b36d40997bc2839b 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. diff -r 80c672780889 -r 29c951d93e6d lisp/gnus/ChangeLog --- 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 + + * nnimap.el (nnimap-open-connection): tls-program should be a list of + programs. + +2010-10-14 Julien Danjou + + * gnus-group.el (gnus-group-insert-group-line): Fix group argument to + `gnus-group-get-icon'. + 2010-10-13 Lars Magne Ingebrigtsen * nnimap.el (nnimap-close-server): Forget the nnimap data on close. diff -r 80c672780889 -r 29c951d93e6d lisp/gnus/gnus-group.el --- 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 diff -r 80c672780889 -r 29c951d93e6d lisp/gnus/nnimap.el --- 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"))))