Mercurial > emacs
comparison lisp/ChangeLog @ 110667:a554263b06d4
Fix previous merge from Gnus trunk.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 01 Oct 2010 00:34:42 +0000 |
| parents | 3b9bd3888ee9 |
| children | 838ae151fca7 |
comparison
equal
deleted
inserted
replaced
| 110666:3b9bd3888ee9 | 110667:a554263b06d4 |
|---|---|
| 1 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 |
| 3 * tls.el (tls-starttls-switches): New variable. | 3 * net/tls.el (tls-starttls-switches): New variable. |
| 4 (tls-find-starttls-argument): Use it. | 4 (tls-find-starttls-argument): Use it. |
| 5 (open-tls-stream): Ditto. | 5 (open-tls-stream): Ditto. |
| 6 | 6 |
| 7 1 * netrc.el (netrc-credentials): Return the value of the "default" | 7 * net/netrc.el (netrc-credentials): Return the value of the "default" |
| 8 entry. | 8 entry. |
| 9 (netrc-machine): Ditto. | 9 (netrc-machine): Ditto. |
| 10 | 10 |
| 11 2010-09-30 Eli Zaretskii <eliz@gnu.org> | 11 2010-09-30 Eli Zaretskii <eliz@gnu.org> |
| 12 | 12 |