From 373f031296fcda27a2346f743134c9d71dd22daf Mon Sep 17 00:00:00 2001 From: Teodor Zlatanov Date: Mon, 10 Nov 2008 20:10:51 +0000 Subject: [PATCH] (smtpmail-open-stream): Use `starttls-any-program-available'. --- lisp/ChangeLog | 5 +++++ lisp/mail/smtpmail.el | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a7da9dc103..4f9326392d7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-11-10 Teodor Zlatanov + + * mail/smtpmail.el (smtpmail-open-stream): Use + `starttls-any-program-available'. + 2008-11-08 Chong Yidong * 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 debb85dd52c..f597136dd71 100644 --- 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)) -- 2.39.2