1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 583537d889d..d6750648fd5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-08  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (push_named_merge_point): Return 0 when a cycle is detected.
+
+2004-06-07  Juanma Barranquero  <lektu@terra.es>
+
+        * editfns.c (Fuser_login_name, Ffloat_time, Fencode_time)
+        (Fcurrent_time_string, Fcurrent_time_zone)
+        (Finsert_buffer_substring, Ftranspose_regions): Doc fixes.
+
 2004-06-07  Miles Bader  <miles@gnu.org>
 
         * xfaces.c (struct named_merge_point): New type.