Commit 373f0312 authored by Ted Zlatanov's avatar Ted Zlatanov
Browse files

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

parent 4e47bf1f
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
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment