(smtpmail-open-stream): Don't hard code

starttls-program.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4bd6ff79a4567f2142f8298c32f50735c29606e8..9af5f1a4f42b7e9f7403732e04602dc73147e51b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-13  Simon Josefsson  <jas@extundo.com>
+
+       * mail/smtpmail.el (smtpmail-open-stream): Don't hard code
+       starttls-program.
+
 2003-05-13  Rajesh Vaidheeswarran  <rv@gnu.org>
 
        * whitespace.el (whitespace-global-mode): Add :link entry

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 2dbfa18f33a4574994c0b895df4dfc44828b0134..2f15ac2fe7365dd2b3d2c39de3cf6697b39ef900 100644 (file)
--- 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 <kagatani@rbc.ncl.omron.co.jp>
 ;; Maintainer: Simon Josefsson <simon@josefsson.org>
@@ -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)