Commit 0d2d1bdc authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent de43f11b
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.
......
......@@ -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
......
......@@ -318,7 +318,8 @@ textual parts.")
(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"))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment