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

2 files changed, 2 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f9326392d7..efaf053f738 100644
--- 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 f597136dd71..fbf4f965baa 100644
--- 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")