# HG changeset patch # User Richard M. Stallman # Date 1116769749 0 # Node ID 078b075e898453bcfdbafe62339b05fe5fe43001 # Parent 564274a2eaa21ac78acb76519be663a2a335a8ad (smtpmail-open-stream): Use with-no-warnings. (smtpmail-send-queued-mail): Avoid beginning-of-buffer. (starttls-extra-args, starttls-extra-arguments): Add defvars. diff -r 564274a2eaa2 -r 078b075e8984 lisp/mail/smtpmail.el --- a/lisp/mail/smtpmail.el Sun May 22 13:43:55 2005 +0000 +++ b/lisp/mail/smtpmail.el Sun May 22 13:49:09 2005 +0000 @@ -396,7 +396,7 @@ ;;; mail, send it, etc... (let ((file-msg "")) (insert-file-contents smtpmail-queue-index) - (beginning-of-buffer) + (goto-char (point-min)) (while (not (eobp)) (setq file-msg (buffer-substring (point) (line-end-position))) (load file-msg) @@ -465,11 +465,14 @@ (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 () - (progn + (with-no-warnings (require 'starttls) (call-process (if starttls-use-gnutls starttls-gnutls-program