[Emacs-diffs] /srv/bzr/emacs/trunk r104384: Merge from emacs-23; up to r100588.

[Glenn Morris]

------------------------------------------------------------
revno: 104384 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-27 00:18:15 -0700
message:
  Merge from emacs-23; up to r100588.
modified:
  lisp/ChangeLog
  lisp/mail/sendmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-27 01:58:50 +0000
+++ b/lisp/ChangeLog    2011-05-27 07:18:15 +0000
@@ -1,3 +1,8 @@
+2011-05-27  Kenichi Handa  <address@hidden>
+
+       * mail/sendmail.el (mail-encode-header): Avoid double encoding by
+       let-binding rfc2047-encode-encoded-words to nil.
+
 2011-05-27  Glenn Morris  <address@hidden>
 
        * mail/emacsbug.el: Don't require url-util.

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2011-05-24 03:54:18 +0000
+++ b/lisp/mail/sendmail.el     2011-05-27 07:18:15 +0000
@@ -1022,7 +1022,8 @@
            (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)))))