Mercurial > emacs
changeset 110568:04b79dd168dd
nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS before starting negotiation.
gnus.el (gnus-local-domain): Put gnus-local-domain back again, since apparently third-party libraries depend on it.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sat, 25 Sep 2010 14:19:38 +0000 |
| parents | 20537dcb489d |
| children | 5e158658b471 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus.el lisp/gnus/nnimap.el |
| diffstat | 3 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sat Sep 25 14:05:46 2010 +0000 +++ b/lisp/gnus/ChangeLog Sat Sep 25 14:19:38 2010 +0000 @@ -1,5 +1,11 @@ 2010-09-25 Lars Magne Ingebrigtsen <larsi@gnus.org> + * gnus.el (gnus-local-domain): Put gnus-local-domain back again, since + apparently third-party libraries depend on it. + + * nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS + before starting negotiation. + * gnus-art.el (gnus-treat-from-gravatar): Change default to nil for privacy reasons. (gnus-treat-mail-gravatar): Ditto.
--- a/lisp/gnus/gnus.el Sat Sep 25 14:05:46 2010 +0000 +++ b/lisp/gnus/gnus.el Sat Sep 25 14:19:38 2010 +0000 @@ -1428,6 +1428,15 @@ "Default default new newsgroups the first time Gnus is run. Should be set in paths.el, and shouldn't be touched by the user.") +(defcustom gnus-local-domain nil + "Local domain name without a host name. +The DOMAINNAME environment variable is used instead if it is defined. +If the function `system-name' returns the full Internet name, there is +no need to set this variable." + :group 'gnus-message + :type '(choice (const :tag "default" nil) + string)) + (defvar gnus-local-organization nil "String with a description of what organization (if any) the user belongs to. Obsolete variable; use `message-user-organization' instead.")
--- a/lisp/gnus/nnimap.el Sat Sep 25 14:05:46 2010 +0000 +++ b/lisp/gnus/nnimap.el Sat Sep 25 14:19:38 2010 +0000 @@ -310,7 +310,7 @@ (gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil) (when (setq connection-result (nnimap-wait-for-connection)) (when (eq nnimap-stream 'starttls) - (nnimap-send-command "STARTTLS") + (nnimap-command "STARTTLS") (starttls-negotiate (nnimap-process nnimap-object))) (unless (equal connection-result "PREAUTH") (if (not (setq credentials