summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/sendmail.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b7eabd2009..14531f6adc5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-13 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * mail/sendmail.el (mail-encode-header):
+ Bind rfc2047-encode-encoded-words to nil.
+
2012-03-13 Glenn Morris <rgm@gnu.org>
* calendar/calendar.el (calendar-string-spread):
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f4dfcfcf647..4e2d827fc29 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1085,9 +1085,10 @@ Return non-nil if and only if some part of the header is encoded."
(cons selected mm-coding-system-priorities)
mm-coding-system-priorities))
(tick (buffer-chars-modified-tick))
- ;; rms: this proved necessary, but I don't recall why.
- ;; Can anyone determine why, and state it here?
- (rfc2047-encode-encoded-words t))
+ ;; Many mailers, including Gnus, passes a message of which
+ ;; the header is already encoded, so this is necessary to
+ ;; prevent it from being encoded again.
+ (rfc2047-encode-encoded-words nil))
(rfc2047-encode-message-header)
(= tick (buffer-chars-modified-tick)))))