[Emacs-diffs] /srv/bzr/emacs/trunk r110848: gnus-art.el (gnus-article-browse-html-parts): Always replace charset in meta tag with the one the part specifies in its header

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 110848
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 23:49:58 +0000
message:
  gnus-art.el (gnus-article-browse-html-parts): Always replace charset in meta 
tag with the one the part specifies in its header
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-11-03 01:26:25 +0000
+++ b/lisp/gnus/ChangeLog       2012-11-08 23:49:58 +0000
@@ -1,3 +1,8 @@
+2012-11-08  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-dired.el (gnus-dired-attach): Attach to last used message buffer

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2012-09-25 23:57:37 +0000
+++ b/lisp/gnus/gnus-art.el     2012-11-08 23:49:58 +0000
@@ -2877,7 +2877,7 @@
             ;; 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 @@
                                                              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 @@
                                       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 @@
                   (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)