From: Simon Josefsson Date: Sun, 3 Jun 2001 10:10:50 +0000 (+0000) Subject: 2001-06-03 Simon Josefsson X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;ds=sidebyside;h=5492b7189e8d074c9ff1423760b9fc421650b20e;p=gnus 2001-06-03 Simon Josefsson * 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 dfd2c7400..61d31c4a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-06-03 Simon Josefsson + + * 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 * imap.el (imap-kerberos4-open): diff --git a/lisp/imap.el b/lisp/imap.el index f412add7c..e1d07feda 100644 --- 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))