# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1118717376 0
# Node ID 50897c4b692208d0ca32a4714d133138aefb3919
# Parent  a9e682106a4ddd4d2222fd1c107c38bac02469a1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 80-82)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-view.el (mm-inline-text): Withdraw the last change.

2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while
   executing enriched-decode.

diff -r a9e682106a4d -r 50897c4b6922 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Jun 14 00:39:32 2005 +0000
+++ b/lisp/gnus/ChangeLog	Tue Jun 14 02:49:36 2005 +0000
@@ -1,3 +1,12 @@
+2005-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-view.el (mm-inline-text): Withdraw the last change.
+
+2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while
+	executing enriched-decode.
+
 2005-06-04  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* gnus-art.el (article-update-date-lapsed): Use `save-match-data'.