Commit be520aca authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-23; up to 2010-06-12T10:58:54Z!romain@orebokech.com.

parents 5ec8a862 c92a1e54
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-27 Glenn Morris <rgm@gnu.org> 2011-05-27 Glenn Morris <rgm@gnu.org>
* mail/emacsbug.el: Don't require url-util. * mail/emacsbug.el: Don't require url-util.
......
...@@ -1022,7 +1022,8 @@ Return non-nil if and only if some part of the header is encoded." ...@@ -1022,7 +1022,8 @@ Return non-nil if and only if some part of the header is encoded."
(if (and selected (coding-system-get selected :mime-charset)) (if (and selected (coding-system-get selected :mime-charset))
(cons selected mm-coding-system-priorities) (cons selected mm-coding-system-priorities)
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) (rfc2047-encode-message-header)
(= tick (buffer-chars-modified-tick))))) (= tick (buffer-chars-modified-tick)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment