Merge remote branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 493a7c8..c6873ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -129,6 +129,9 @@
 
 2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-art.el (article-wash-html): Ensure that we insert the HTML into
+       a multibyte buffer (bug#7410).
+
        * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken
        .newsrc.el files.
 
@@ -237,6 +240,13 @@
 
        * gnus-start.el (gnus-1): Avoid duplicate entries.
 
+2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+       application/octet-stream parts really is.
+
+       * gnus-sum.el (gnus-propagate-marks): Remove.
+
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * imap.el: Remove.
@@ -248,13 +258,6 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
-2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-
-       * gnus-sum.el (gnus-propagate-marks): Remove.
-
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index aa83789..d120ec6 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2758,6 +2758,7 @@ If READ-CHARSET, ask for a coding system."
       (setq handles (mm-dissect-buffer t t)))
     (article-goto-body)
     (delete-region (point) (point-max))
+    (mm-enable-multibyte)
     (mm-inline-text-html handles)))
 
 (defvar gnus-article-browse-html-temp-list nil