(smtpmail-open-stream): Use `starttls-any-program-available'. Auto-load starttls...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f9326392d7922c31244ed984c9d41e3761570e4..efaf053f738c499cc214b9a5784dbb6973098704 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2008-11-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * mail/smtpmail.el (smtpmail-open-stream): Use
-       `starttls-any-program-available'.
+       `starttls-any-program-available'.  Auto-load starttls.el for it.
 
 2008-11-08  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index f597136dd71561c9a5f8124542eb402bad741adf..fbf4f965baa12bd7a4cc47e940a66c58b663d3ae 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -67,6 +67,7 @@
 ;;; Code:
 
 (require 'sendmail)
+(autoload 'starttls-any-program-available "starttls")
 (autoload 'starttls-open-stream "starttls")
 (autoload 'starttls-negotiate "starttls")
 (autoload 'mail-strip-quoted-names "mail-utils")