diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-11-08 23:49:58 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-11-08 23:49:58 +0000 |
| commit | c01f021313dcc50bdf8d4aa28e583214c5bba14c (patch) | |
| tree | 690aa914b56a87aa9f9d1bdefb0ec70ddce5a68b /lisp | |
| parent | 61ddb1b9e10518fe3e5c66a255119de92b48f2a0 (diff) | |
| download | emacs-c01f021313dcc50bdf8d4aa28e583214c5bba14c.tar.gz | |
gnus-art.el (gnus-article-browse-html-parts): Always replace charset in meta tag with the one the part specifies in its header
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 78204897cf1..5f635e59cdf 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-11-08 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (gnus-article-browse-html-parts): Always replace charset + in meta tag with the one the part specifies in its header. + 2012-11-02 Stephen Eglen <S.J.Eglen@damtp.cam.ac.uk> * gnus-dired.el (gnus-dired-attach): Attach to last used message buffer diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 6c827e070cb..edcd7da2ddd 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -2877,7 +2877,7 @@ message header will be added to the bodies of the \"text/html\" parts." ;; Add a meta html tag to specify charset and a header. (cond (header - (let (title eheader body hcharset coding force-charset) + (let (title eheader body hcharset coding) (with-temp-buffer (mm-enable-multibyte) (setq case-fold-search t) @@ -2900,8 +2900,7 @@ message header will be added to the bodies of the \"text/html\" parts." charset) title (when title (mm-encode-coding-string title charset)) - body (mm-encode-coding-string content charset) - force-charset t) + body (mm-encode-coding-string content charset)) (setq hcharset (mm-find-mime-charset-region (point-min) (point-max))) (cond ((= (length hcharset) 1) @@ -2932,8 +2931,7 @@ message header will be added to the bodies of the \"text/html\" parts." body (mm-encode-coding-string (mm-decode-coding-string content body) - charset) - force-charset t))) + charset)))) (setq charset hcharset eheader (mm-encode-coding-string (buffer-string) coding) @@ -2947,7 +2945,7 @@ message header will be added to the bodies of the \"text/html\" parts." (mm-disable-multibyte) (insert body) (when charset - (mm-add-meta-html-tag handle charset force-charset)) + (mm-add-meta-html-tag handle charset t)) (when title (goto-char (point-min)) (unless (search-forward "<title>" nil t) |