Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-181
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-182
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-183
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-184
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-185
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-186
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-187
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-188
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-189
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-190
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-191
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-192
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-132

1 files changed, 6 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 819b4db4a1d..75b3be839e1 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * make-docfile.c (xmalloc): Fix return type.
+        (put_filename): New fun.
+        (scan_file): Use it.
+
 2004-03-09  Juanma Barranquero  <lektu@terra.es>
 
         * grep-changelog: Changes to support ChangeLog.10+.