[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101961: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101961: Merge changes made in Gnus trunk. |
Date: |
Thu, 14 Oct 2010 10:16:59 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101961
author: Gnus developers
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-14 10:16:59 +0000
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-group.el
lisp/gnus/nnimap.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-13 23:12:47 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-14 10:16:59 +0000
@@ -1,3 +1,13 @@
+2010-10-14 Lars Magne Ingebrigtsen <address@hidden>
+
+ * nnimap.el (nnimap-open-connection): tls-program should be a list of
+ programs.
+
+2010-10-14 Julien Danjou <address@hidden>
+
+ * gnus-group.el (gnus-group-insert-group-line): Fix group argument to
+ `gnus-group-get-icon'.
+
2010-10-13 Lars Magne Ingebrigtsen <address@hidden>
* nnimap.el (nnimap-close-server): Forget the nnimap data on close.
=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el 2010-10-11 23:29:33 +0000
+++ b/lisp/gnus/gnus-group.el 2010-10-14 10:16:59 +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
=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el 2010-10-13 23:12:47 +0000
+++ b/lisp/gnus/nnimap.el 2010-10-14 10:16:59 +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"))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101961: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=