diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-09-25 14:19:38 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-25 14:19:38 +0000 |
| commit | 6f33b4d7e3f67f82ce0cf85a1cc0a22b48b017c5 (patch) | |
| tree | 557d43167efebb3014c40d41aa995032a1a81009 /lisp/gnus | |
| parent | 6688abe01e19c202d266f7d01d704d73df44ed1e (diff) | |
| download | emacs-6f33b4d7e3f67f82ce0cf85a1cc0a22b48b017c5.tar.gz | |
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.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 9 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 60986010df8..0ddf95c3a0d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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. diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 2a5533db079..c3bf47b9533 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1428,6 +1428,15 @@ you could set this variable: "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.") diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 16a43423bfb..000855db8da 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -310,7 +310,7 @@ not done by default on servers that doesn't support that command.") (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 |