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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a7da9d..4f93263 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * mail/smtpmail.el (smtpmail-open-stream): Use
+       `starttls-any-program-available'.
+
 2008-11-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * dired.el (dired-read-dir-and-switches): Revert to 2007-11-22

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index debb85d..f597136 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -503,13 +503,7 @@ This is relative to `smtpmail-queue-dir'."
 (defun smtpmail-open-stream (process-buffer host port)
   (let ((cred (smtpmail-find-credentials
               smtpmail-starttls-credentials host port)))
-    (if (null (and cred (condition-case ()
-                           (with-no-warnings
-                             (require 'starttls)
-                             (call-process (if starttls-use-gnutls
-                                               starttls-gnutls-program
-                                             starttls-program)))
-                         (error nil))))
+    (if (null (and cred (starttls-any-program-available)))
        ;; The normal case.
        (open-network-stream "SMTP" process-buffer host port)
       (let* ((cred-key (smtpmail-cred-key cred))