mail/sendmail.el (mail-encode-header): Avoid double encoding by let-binding rfc2047...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bad99e7294b44062979881cb4cf35b0451e0213d..965886b02ae10e61d38ebdd252fa4050a50f1005 100644 (file)
--- 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 b6fd586c2ed1dfdd7c6ddedf509cd37b0bba029c..9e3a6d8f7f6814b6ffe47a5fec51e32c795491f3 100644 (file)
--- 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)))))