From: Kim F. Storm <storm@cua.dk>
Date: Fri, 14 May 2004 20:15:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~6220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=93589c1fed7e3ad3b0fc5338d0c33500a3fb0915;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a0168a7afc1..ef33ea06aac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.