aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-12-10 19:49:32 +0000
committerEli Zaretskii2001-12-10 19:49:32 +0000
commit19a0baf79c376cee76278e29991be180695296ef (patch)
treea3912d9e1854fcd0f177c7be074aacf8e36a297a
parent440c4d7aa858844a0ff64ce28e76c2628ad978a3 (diff)
downloademacs-19a0baf79c376cee76278e29991be180695296ef.tar.gz
emacs-19a0baf79c376cee76278e29991be180695296ef.zip
(smtpmail-send-queued-mail): Insert the enqueued messages literally.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/smtpmail.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a01ba38fa6..40b6643c81a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-12-10 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * mail/smtpmail.el (smtpmail-send-queued-mail): Insert the
4 enqueued messages literally.
5
12001-12-10 Noah Friedman <friedman@splode.com> 62001-12-10 Noah Friedman <friedman@splode.com>
2 7
3 * battery.el (battery-insert-file-contents): Obsolete function 8 * battery.el (battery-insert-file-contents): Obsolete function
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index ed4bd7c8ddd..a24aae74bf0 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -376,7 +376,10 @@ This is relative to `smtpmail-queue-dir'.")
376 (while (not (eobp)) 376 (while (not (eobp))
377 (setq file-msg (buffer-substring (point) (line-end-position))) 377 (setq file-msg (buffer-substring (point) (line-end-position)))
378 (load file-msg) 378 (load file-msg)
379 (setq tembuf (find-file-noselect file-msg)) 379 ;; Insert the message literally: it is already encoded as per
380 ;; the MIME headers, and code conversions might guess the
381 ;; encoding wrongly.
382 (setq tembuf (find-file-noselect file-msg nil t))
380 (if (not (null smtpmail-recipient-address-list)) 383 (if (not (null smtpmail-recipient-address-list))
381 (if (not (smtpmail-via-smtp smtpmail-recipient-address-list 384 (if (not (smtpmail-via-smtp smtpmail-recipient-address-list
382 tembuf)) 385 tembuf))