*** empty log message ***

* empty log message *
62f3da3b · Kim F. Storm · 0a4455b2 · 62f3da3b · 62f3da3b
Commit 62f3da3b authored May 14, 2004 by Kim F. Storm
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

lisp/ChangeLog lisp/ChangeLog +7 -0

src/ChangeLog src/ChangeLog +0 -5

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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.

--- a/src/ChangeLog
+++ b/src/ChangeLog
-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.