nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS before starting...

gnus.el (gnus-local-domain): Put gnus-local-domain back again, since apparently third-party libraries depend on it.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60986010df88a49091ed8d3155a40b811070d924..0ddf95c3a0d6087e188bb96c454a48e0390c87d1 100644 (file)
--- 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 2a5533db0799fe02a4e4341e25f26fd3c6e50496..c3bf47b9533719fa97d6f74011faa4c989cf4415 100644 (file)
--- 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 16a43423bfb0416aa2e2bbc405c09a391ba4bf62..000855db8da77f84bbadaa700cf06344c03c7463 100644 (file)
--- 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