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

[Richard M . Stallman]

Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.73 emacs/lisp/mail/smtpmail.el:1.74
*** emacs/lisp/mail/smtpmail.el:1.73    Mon May 16 11:16:34 2005
--- emacs/lisp/mail/smtpmail.el Sun May 22 13:49:09 2005
***************
*** 396,402 ****
      ;;; mail, send it, etc...
      (let ((file-msg ""))
        (insert-file-contents smtpmail-queue-index)
!       (beginning-of-buffer)
        (while (not (eobp))
        (setq file-msg (buffer-substring (point) (line-end-position)))
        (load file-msg)
--- 396,402 ----
      ;;; mail, send it, etc...
      (let ((file-msg ""))
        (insert-file-contents smtpmail-queue-index)
!       (goto-char (point-min))
        (while (not (eobp))
        (setq file-msg (buffer-substring (point) (line-end-position)))
        (load file-msg)
***************
*** 465,475 ****
        (push el2 result)))
      (nreverse result)))
  
  (defun smtpmail-open-stream (process-buffer host port)
    (let ((cred (smtpmail-find-credentials
               smtpmail-starttls-credentials host port)))
      (if (null (and cred (condition-case ()
!                           (progn
                              (require 'starttls)
                              (call-process (if starttls-use-gnutls
                                                starttls-gnutls-program
--- 465,478 ----
        (push el2 result)))
      (nreverse result)))
  
+ (defvar starttls-extra-args)
+ (defvar starttls-extra-arguments)
+ 
  (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