[Emacs-diffs] /srv/bzr/emacs/trunk r101611: nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS before starting negotiation.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101611
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 14:19:38 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-25 14:05:46 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-25 14:19:38 +0000
@@ -1,5 +1,11 @@
 2010-09-25  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2010-09-25 13:28:07 +0000
+++ b/lisp/gnus/gnus.el 2010-09-25 14:19:38 +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.")

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/nnimap.el       2010-09-25 14:19:38 +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