# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1084576134 0
# Node ID c9d9adb762447bd989c790d5434b904b95e906f7
# Parent  2f83cdfb90f66676683a78f1f4446895f15d5375
*** empty log message ***

diff -r 2f83cdfb90f6 -r c9d9adb76244 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 14 23:01:45 2004 +0000
+++ b/lisp/ChangeLog	Fri May 14 23:08:54 2004 +0000
@@ -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 -r 2f83cdfb90f6 -r c9d9adb76244 src/ChangeLog
--- a/src/ChangeLog	Fri May 14 23:01:45 2004 +0000
+++ b/src/ChangeLog	Fri May 14 23:08:54 2004 +0000
@@ -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.