diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/smtpmail.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4bd6ff79a4..9af5f1a4f4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-05-13 Simon Josefsson <[email protected]> + + * mail/smtpmail.el (smtpmail-open-stream): Don't hard code + starttls-program. + 2003-05-13 Rajesh Vaidheeswarran <[email protected]> * whitespace.el (whitespace-global-mode): Add :link entry diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 2dbfa18f33..2f15ac2fe7 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -1,6 +1,6 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -;; Copyright (C) 1995, 1996, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2001, 2002, 2003 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani <[email protected]> ;; Maintainer: Simon Josefsson <[email protected]> @@ -457,7 +457,9 @@ This is relative to `smtpmail-queue-dir'.") (let ((cred (smtpmail-find-credentials smtpmail-starttls-credentials host port))) (if (null (and cred (condition-case () - (call-process "starttls") + (progn + (require 'starttls) + (call-process starttls-program)) (error nil)))) ;; The normal case. (open-network-stream "SMTP" process-buffer host port) |