*** empty log message ***

2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83e46adbf58..e7be74c4d43 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-15  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/timer.el (timer-activate): Add optional arg triggered-p.
+        Use it to set triggered-p element of timer.
+        (timer-event-handler): Set triggered-p element non-nil while running
+        the timer function.
+
 2004-05-14  David Ponce  <david@dponce.com>
 
         * tree-widget.el: New file.
diff --git a/src/ChangeLog b/src/ChangeLog
index ef33ea06aac..a0168a7afc1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,3 @@
-2004-05-14  Kim F. Storm  <storm@cua.dk>
-
-        * keyboard.c (in_timer_check): New static var.
-        (timer_check): Use it to guard against reentry.
-
 2004-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * w32fns.c (Fw32_define_rgb_color): Avoid XSET.