[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el

[Simon Josefsson]

Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.55 emacs/lisp/mail/smtpmail.el:1.56
*** emacs/lisp/mail/smtpmail.el:1.55    Fri May  9 18:48:10 2003
--- emacs/lisp/mail/smtpmail.el Tue May 13 15:48:21 2003
***************
*** 1,6 ****
  ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
  
! ;; Copyright (C) 1995, 1996, 2001, 2002 Free Software Foundation, Inc.
  
  ;; Author: Tomoji Kagatani <address@hidden>
  ;; Maintainer: Simon Josefsson <address@hidden>
--- 1,6 ----
  ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
  
! ;; Copyright (C) 1995, 1996, 2001, 2002, 2003 Free Software Foundation, Inc.
  
  ;; Author: Tomoji Kagatani <address@hidden>
  ;; Maintainer: Simon Josefsson <address@hidden>
***************
*** 457,463 ****
    (let ((cred (smtpmail-find-credentials
               smtpmail-starttls-credentials host port)))
      (if (null (and cred (condition-case ()
!                           (call-process "starttls")
                          (error nil))))
        ;; The normal case.
        (open-network-stream "SMTP" process-buffer host port)
--- 457,465 ----
    (let ((cred (smtpmail-find-credentials
               smtpmail-starttls-credentials host port)))
      (if (null (and cred (condition-case ()
!                           (progn
!                             (require 'starttls)
!                             (call-process starttls-program))
                          (error nil))))
        ;; The normal case.
        (open-network-stream "SMTP" process-buffer host port)