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 | |
| parent | de43f11b3670d9a5776d9df6127ff12302e1fe65 (diff) | |
| download | emacs-0d2d1bdcf33695592726c77c88d9d306f9e1d189.tar.gz | |
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')
| -rw-r--r-- | lisp/gnus/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index d844f74ee1f..8f7cdb439f6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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. 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 diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index b530ce609f4..3fbcef60bc0 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -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")))) |