From: Miles Bader <miles@gnu.org>
Date: Tue, 14 Jun 2005 02:49:36 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406
X-Git-Tag: emacs-pretest-22.0.90~8984
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a21fb88e7fefce83fa8ae40114cfbd0249019abe;p=emacs.git

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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3681f2fa750..841357e28ae 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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'.