Mercurial > emacs
changeset 99478:7555ac1526bf
(smtpmail-open-stream): Use `starttls-any-program-available'.
| author | Teodor Zlatanov <tzz@lifelogs.com> |
|---|---|
| date | Mon, 10 Nov 2008 20:10:51 +0000 |
| parents | 0fd411ceb682 |
| children | cd67cf7962fa |
| files | lisp/ChangeLog lisp/mail/smtpmail.el |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Nov 10 15:29:12 2008 +0000 +++ b/lisp/ChangeLog Mon Nov 10 20:10:51 2008 +0000 @@ -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
--- a/lisp/mail/smtpmail.el Mon Nov 10 15:29:12 2008 +0000 +++ b/lisp/mail/smtpmail.el Mon Nov 10 20:10:51 2008 +0000 @@ -503,13 +503,7 @@ (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))