summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/sendmail.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bad99e7294b..965886b02ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-27 Kenichi Handa <handa@m17n.org>
+
+ * mail/sendmail.el (mail-encode-header): Avoid double encoding by
+ let-binding rfc2047-encode-encoded-words to nil.
+
2011-05-23 Kenichi Handa <handa@m17n.org>
* mail/sendmail.el: Require `rfc2047'.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index b6fd586c2ed..9e3a6d8f7f6 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1029,7 +1029,8 @@ Return non-nil if and only if some part of the header is encoded."
(if (and selected (coding-system-get selected :mime-charset))
(cons selected mm-coding-system-priorities)
mm-coding-system-priorities))
- (tick (buffer-chars-modified-tick)))
+ (tick (buffer-chars-modified-tick))
+ (rfc2047-encode-encoded-words nil))
(rfc2047-encode-message-header)
(= tick (buffer-chars-modified-tick)))))