*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fa14ecdcc93abb68b58398672259c44afb205f6..f748728d7fcebf9e601b61880cb823a0593cebe2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-diff):
+       * vc-arch.el (vc-arch-diff): Add optional `buffer' arg.
+
 2004-05-28  Juri Linkov  <juri@jurta.org>
 
        * simple.el (eval-expression-print-format): New fun.

diff --git a/src/ChangeLog b/src/ChangeLog
index 96a5c27d9646bb5a09db62018eaef8d728048343..df10f95e500cd26bd512bc29caccf812e5a0d3b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * alloc.c: Undo Kim's recent changes and fix the same bug differently.
+       (marker_blocks_pending_free): Remove.
+       (Fgarbage_collect): Sweep after cleaning up undo-lists.
+       Mark the undo lists after claning them up.
+       Don't free block in marker_blocks_pending_free.
+       (mark_buffer): Don't mark undo_list.
+       (gc_sweep): Sweep hash-tables and strings first.
+       Do free marker blocks that are empty.
+
 2004-05-28  Jim Blandy  <jimb@redhat.com>
 
        * regex.c (print_partial_compiled_pattern): Add missing 'break'