X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fimap.el;h=107e894589d864eda9edecf7a96bde27dab6180d;hb=7d3cebb22d43e3ae26e7b1ab3b40c12ec80be154;hp=a6bf517426bbc542430977c4dd00efa77ac0dd7a;hpb=7b65658e7e317b09023f3dc3b86e1f5b45538705;p=elisp%2Fgnus.git-

diff --git a/lisp/imap.el b/lisp/imap.el
index a6bf517..107e894 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -221,7 +221,8 @@ used to communicate with subprocesses.  Values are nil to use a
 pipe, or t or `pty' to use a pty.  The value has no effect if the
 system has no ptys or if all ptys are busy: then a pipe is used
 in any case.  The value takes effect when a IMAP server is
-opened, changing it after that has no effect.."
+opened, changing it after that has no effect."
+  :version "21.4"
   :group 'imap
   :type 'boolean)
 
@@ -296,7 +297,7 @@ stream.")
 			      kerberos4
 			      digest-md5
 			      cram-md5
-			      sasl
+			      ;;sasl
 			      login
 			      anonymous)
   "Priority of authenticators to consider when authenticating to server.")
@@ -625,7 +626,7 @@ sure of changing the value of `foo'."
       (message "imap: Opening SSL connection with `%s'..." cmd)
       (erase-buffer)
       (let ((port (or port imap-default-ssl-port))
-	    (process-connection-type nil)
+	    (process-connection-type imap-process-connection-type)
 	    process)
 	(when (prog1
 		  (setq process (as-binary-process
@@ -2058,7 +2059,9 @@ Return nil if no complete line has arrived."
 	(when (eq (char-after) ?\))
 	  (imap-forward)
 	  (nreverse addresses)))
-    (assert (imap-parse-nil) t "In imap-parse-address-list")))
+    ;; With assert, the code might not be eval'd.
+    ;; (assert (imap-parse-nil) t "In imap-parse-address-list")
+    (imap-parse-nil)))
 
 ;;   mailbox         = "INBOX" / astring
 ;;                       ; INBOX is case-insensitive.  All case variants of
@@ -2623,7 +2626,9 @@ Return nil if no complete line has arrived."
 	      (imap-forward)
 	      (push (imap-parse-string-list) dsp)
 	      (imap-forward))
-	  (assert (imap-parse-nil) t "In imap-parse-body-ext"))
+	  ;; With assert, the code might not be eval'd.
+	  ;; (assert (imap-parse-nil) t "In imap-parse-body-ext")
+	  (imap-parse-nil))
 	(push (nreverse dsp) ext))
       (when (eq (char-after) ?\ ) ;; body-fld-lang
 	(imap-forward)