Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-92

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 230, 234, 240, 243)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 60)

   - Merge from emacs--cvs-trunk--0

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29bb49f..913c378 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1087,7 +1087,7 @@
 
 2004-11-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-art. (gnus-article-edit-article): Don't associate the
+       * gnus-art.el (gnus-article-edit-article): Don't associate the
        article buffer with a draft file.  This is a temporary measure
        against the 2004-08-22 change to gnus-article-edit-mode.
 

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 2a774e2..5d7a608 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -12604,7 +12604,7 @@
 
        * nnfolder.el (nnfolder-read-folder): Use group instead of
        nnfolder-current-group.
-       Suggested by Lorentey Karoly <lorentey@elte.hu>.
+       Suggested by K\e,Ba\e(Broly L\e,Bu\e(Brentey <lorentey@elte.hu>.
 
 2001-11-17  Simon Josefsson  <jas@extundo.com>