From: tomo <tomo>
Date: Tue, 4 Jun 2002 08:52:31 +0000 (+0000)
Subject: GNU Emacs 21.2 with LEIM.
X-Git-Tag: Emacs-21_2+LEIM
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FFSF;p=elisp%2Flemi.git

GNU Emacs 21.2 with LEIM.
---

diff --git a/mail/feedmail.el b/mail/feedmail.el
index a567907..7db3215 100644
--- a/mail/feedmail.el
+++ b/mail/feedmail.el
@@ -308,7 +308,7 @@
 (defgroup feedmail nil
   "Assist other email packages to massage outgoing messages."
   :link '(url-link "http://www.carpenter.org/feedmail/feedmail.html")
-  :link '(emacs-commentary "feedmail")
+  :link '(emacs-commentary-link "feedmail")
   :group 'mail)
 
 (defgroup feedmail-misc nil
diff --git a/mail/smtpmail.el b/mail/smtpmail.el
index f57d087..f3786c4 100644
--- a/mail/smtpmail.el
+++ b/mail/smtpmail.el
@@ -310,7 +310,10 @@ This is relative to `smtpmail-queue-dir'.")
 						   (end-of-line)
 						   (point))))
 	(load file-msg)
-	(setq tembuf (find-file-noselect file-msg))
+	;; 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))