2001-06-03 Simon Josefsson <simon@josefsson.org>

	* imap.el (imap-ssl-open): Require ssl. (Otherwise ssl.el is
	autoloaded incorrectly below because ssl-program-* is bound.)
	Thanks to Amos Gouaux for report.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfd2c74..61d31c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-03  Simon Josefsson  <simon@josefsson.org>
+
+       * imap.el (imap-ssl-open): Require ssl. (Otherwise ssl.el is
+       autoloaded incorrectly below because ssl-program-* is bound.)
+       Thanks to Amos Gouaux for report.
+
 2001-06-02  Simon Josefsson  <simon@josefsson.org>
 
        * imap.el (imap-kerberos4-open): 

diff --git a/lisp/imap.el b/lisp/imap.el
index f412add..e1d07fe 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -567,6 +567,7 @@ If ARGS, PROMPT is used as an argument to `format'."
   (let ((cmds (if (listp imap-ssl-program) imap-ssl-program
                (list imap-ssl-program)))
        cmd done)
+    (ignore-errors (require 'ssl))
     (while (and (not done) (setq cmd (pop cmds)))
       (message "imap: Opening SSL connection with `%s'..." cmd)
       (let* ((port (or port imap-default-ssl-port))