[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el |
Date: |
Fri, 21 Dec 2001 07:06:21 -0500 |
Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.37 emacs/lisp/mail/smtpmail.el:1.38
*** emacs/lisp/mail/smtpmail.el:1.37 Mon Dec 10 14:48:32 2001
--- emacs/lisp/mail/smtpmail.el Fri Dec 21 07:06:21 2001
***************
*** 367,377 ****
(defun smtpmail-send-queued-mail ()
"Send mail that was queued as a result of setting `smtpmail-queue-mail'."
(interactive)
! ;;; Get index, get first mail, send it, get second mail, etc...
! (let ((buffer-index (find-file-noselect smtpmail-queue-index))
! (file-msg "")
! (tembuf nil))
! (with-current-buffer buffer-index
(beginning-of-buffer)
(while (not (eobp))
(setq file-msg (buffer-substring (point) (line-end-position)))
--- 367,377 ----
(defun smtpmail-send-queued-mail ()
"Send mail that was queued as a result of setting `smtpmail-queue-mail'."
(interactive)
! (with-temp-buffer
! ;;; Get index, get first mail, send it, update index, get second
! ;;; 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)))
***************
*** 379,398 ****
;; Insert the message literally: it is already encoded as per
;; the MIME headers, and code conversions might guess the
;; encoding wrongly.
! (setq tembuf (find-file-noselect file-msg nil t))
! (if (not (null smtpmail-recipient-address-list))
! (if (not (smtpmail-via-smtp smtpmail-recipient-address-list
! tembuf))
! (error "Sending failed; SMTP protocol error"))
! (error "Sending failed; no recipients"))
(delete-file file-msg)
(delete-file (concat file-msg ".el"))
! (kill-buffer tembuf)
! (kill-line 1))
! (set-buffer buffer-index)
! (save-buffer smtpmail-queue-index)
! (kill-buffer buffer-index)
! )))
;(defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)
--- 379,396 ----
;; Insert the message literally: it is already encoded as per
;; the MIME headers, and code conversions might guess the
;; encoding wrongly.
! (with-temp-buffer
! (let ((coding-system-for-read 'no-conversion))
! (insert-file-contents file-msg))
! (if (not (null smtpmail-recipient-address-list))
! (if (not (smtpmail-via-smtp smtpmail-recipient-address-list
! (current-buffer)))
! (error "Sending failed; SMTP protocol error"))
! (error "Sending failed; no recipients")))
(delete-file file-msg)
(delete-file (concat file-msg ".el"))
! (kill-line 1))
! (write-region (point-min) (point-max) smtpmail-queue-index))))
;(defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)