2 files changed, 62 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 87e7f595cab..bb92d478277 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,34 @@
+2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+        * gnus-art.el (gnus-use-idna)
+        * gnus-start.el (gnus-site-init-file)
+        * message.el (message-use-idna)
+        * mm-uu.el (mm-uu-hide-markers)
+        * smiley.el (smiley-style): Revert changes that suppress warnings.
+2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+        * gnus-art.el (gnus-article-browse-html-parts): Add meta html tag to
+        specify charset to html source.  Reported by Christoph Conrad
+        <christoph.conrad@gmx.de>.
+2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+        * gnus-art.el (gnus-use-idna): Don't directly refer to the value of
+        idna-program in order to suppress byte compile warning issued by XEmacs
+        that came to byte compile the default value section of defcustom forms
+        recently.
+        * gnus-start.el (gnus-site-init-file): Don't directly refer to the
+        value of installation-directory.
+        * message.el (message-use-idna): Don't directly refer to the value of
+        idna-program.
+        * mm-uu.el (mm-uu-hide-markers): Don't directly call defined-colors.
+        * smiley.el (smiley-style): Don't directly call face-attribute.
 2007-12-04  Reiner Steib  <Reiner.Steib@gmx.de>
        * gnus-group.el (gnus-group-highlight-line): Add FIXME.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 059d43bf0b8..4bb9ceb97ba 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2802,8 +2802,37 @@ Recurse into multiparts."
                    (string-match "text/html" (car (mm-handle-type handle))))
               (let ((tmp-file (mm-make-temp-file
                                ;; Do we need to care for 8.3 filenames?
-                                "mm-" nil ".html")))
+                                "mm-" nil ".html"))
-                 (mm-save-part-to-file handle tmp-file)
+                     (charset (mail-content-type-get (mm-handle-type handle)
+                                                     'charset)))
+                 (if charset
+                     ;; Add a meta html tag to specify charset.
+                     (mm-with-unibyte-buffer
+                       (insert (with-current-buffer (mm-handle-buffer handle)
+                                 (if (eq charset 'gnus-decoded)
+                                     (mm-encode-coding-string
+                                      (buffer-string)
+                                      (setq charset 'utf-8))
+                                   (buffer-string))))
+                       (setq charset (format "\
+<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">"
+                                             charset))
+                       (goto-char (point-min))
+                       (let ((case-fold-search t))
+                         (cond (;; Don't modify existing meta tag.
+                                (re-search-forward "\
+<meta[\t\n\r ]+http-equiv=\"content-type\"[^>]+>"
+                                                   nil t))
+                               ((re-search-forward "<head>[\t\n\r ]*" nil t)
+                                (insert charset "\n"))
+                               (t
+                                (re-search-forward "\
+<html\\(?:[\t\n\r ]+[^>]+\\|[\t\n\r ]*\\)>[\t\n\r ]*"
+                                                   nil t)
+                                (insert "<head>\n" charset "\n</head>\n"))))
+                       (mm-write-region (point-min) (point-max)
+                                        tmp-file nil nil nil 'binary t))
+                   (mm-save-part-to-file handle tmp-file))
                 (add-to-list 'gnus-article-browse-html-temp-list tmp-file)
                 (add-hook 'gnus-summary-prepare-exit-hook
                           'gnus-article-browse-delete-temp-files)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 87e7f595cab..bb92d478277 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,34 @@
		1	2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
		2
		3	* gnus-art.el (gnus-use-idna)
		4	* gnus-start.el (gnus-site-init-file)
		5	* message.el (message-use-idna)
		6	* mm-uu.el (mm-uu-hide-markers)
		7	* smiley.el (smiley-style): Revert changes that suppress warnings.
		8
		9	2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
		10
		11	* gnus-art.el (gnus-article-browse-html-parts): Add meta html tag to
		12	specify charset to html source. Reported by Christoph Conrad
		13	<christoph.conrad@gmx.de>.
		14
		15	2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
		16
		17	* gnus-art.el (gnus-use-idna): Don't directly refer to the value of
		18	idna-program in order to suppress byte compile warning issued by XEmacs
		19	that came to byte compile the default value section of defcustom forms
		20	recently.
		21
		22	* gnus-start.el (gnus-site-init-file): Don't directly refer to the
		23	value of installation-directory.
		24
		25	* message.el (message-use-idna): Don't directly refer to the value of
		26	idna-program.
		27
		28	* mm-uu.el (mm-uu-hide-markers): Don't directly call defined-colors.
		29
		30	* smiley.el (smiley-style): Don't directly call face-attribute.
		31
1	2007-12-04 Reiner Steib <Reiner.Steib@gmx.de>	32	2007-12-04 Reiner Steib <Reiner.Steib@gmx.de>
2		33
3	* gnus-group.el (gnus-group-highlight-line): Add FIXME.	34	* gnus-group.el (gnus-group-highlight-line): Add FIXME.


diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 059d43bf0b8..4bb9ceb97ba 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el
@@ -2802,8 +2802,37 @@ Recurse into multiparts."
2802	(string-match "text/html" (car (mm-handle-type handle))))	2802	(string-match "text/html" (car (mm-handle-type handle))))
2803	(let ((tmp-file (mm-make-temp-file	2803	(let ((tmp-file (mm-make-temp-file
2804	;; Do we need to care for 8.3 filenames?	2804	;; Do we need to care for 8.3 filenames?
2805	"mm-" nil ".html")))	2805	"mm-" nil ".html"))
2806	(mm-save-part-to-file handle tmp-file)	2806	(charset (mail-content-type-get (mm-handle-type handle)
		2807	'charset)))
		2808	(if charset
		2809	;; Add a meta html tag to specify charset.
		2810	(mm-with-unibyte-buffer
		2811	(insert (with-current-buffer (mm-handle-buffer handle)
		2812	(if (eq charset 'gnus-decoded)
		2813	(mm-encode-coding-string
		2814	(buffer-string)
		2815	(setq charset 'utf-8))
		2816	(buffer-string))))
		2817	(setq charset (format "\
		2818	<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">"
		2819	charset))
		2820	(goto-char (point-min))
		2821	(let ((case-fold-search t))
		2822	(cond (;; Don't modify existing meta tag.
		2823	(re-search-forward "\
		2824	<meta[\t\n\r ]+http-equiv=\"content-type\"[^>]+>"
		2825	nil t))
		2826	((re-search-forward "<head>[\t\n\r ]*" nil t)
		2827	(insert charset "\n"))
		2828	(t
		2829	(re-search-forward "\
		2830	<html\\(?:[\t\n\r ]+[^>]+\\\|[\t\n\r ]\\)>[\t\n\r ]"
		2831	nil t)
		2832	(insert "<head>\n" charset "\n</head>\n"))))
		2833	(mm-write-region (point-min) (point-max)
		2834	tmp-file nil nil nil 'binary t))
		2835	(mm-save-part-to-file handle tmp-file))
2807	(add-to-list 'gnus-article-browse-html-temp-list tmp-file)	2836	(add-to-list 'gnus-article-browse-html-temp-list tmp-file)
2808	(add-hook 'gnus-summary-prepare-exit-hook	2837	(add-hook 'gnus-summary-prepare-exit-hook
2809	'gnus-article-browse-delete-temp-files)	2838	'gnus-article-browse-delete-temp-files)