(imap-starttls-open): Erase buffer and disable process

filter before invoking STARTTLS negotiation, to support new
starttls.el that uses GNUTLS.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cac5bde..1215807 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-20  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-starttls-open): Erase buffer and disable process
+       filter before invoking STARTTLS negotiation, to support new
+       starttls.el that uses GNUTLS.
+
 2003-09-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-treat-display-x-face): Use set-default instead

diff --git a/lisp/imap.el b/lisp/imap.el
index c1f460d..b84ec0d 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -770,8 +770,10 @@ sure of changing the value of `foo'."
        (unwind-protect
            (progn
              (set-process-filter imap-process 'imap-arrival-filter)
+             (erase-buffer)
              (when (and (eq imap-stream 'starttls)
                         (imap-ok-p (imap-send-command-wait "STARTTLS")))
+               (set-process-filter imap-process nil)
                (starttls-negotiate imap-process)))
          (set-process-filter imap-process nil)))
       (when (memq (process-status process) '(open run))