diff options
| author | Kim F. Storm | 2004-05-14 23:01:45 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-05-14 23:01:45 +0000 |
| commit | 0a4455b259c891aeb76efe79fc19a43c721856be (patch) | |
| tree | 1f7c2e7dfb7013ac46765cb62414b71eac7eeca0 /src | |
| parent | 9af28288fa636a071149fe67604b0f9691423d0c (diff) | |
| download | emacs-0a4455b259c891aeb76efe79fc19a43c721856be.tar.gz emacs-0a4455b259c891aeb76efe79fc19a43c721856be.zip | |
Undo last change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index a3fae774431..b9e455a4431 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -4249,8 +4249,6 @@ struct input_event last_timer_event; | |||
| 4249 | run the timer directly instead of queueing a timer-event. | 4249 | run the timer directly instead of queueing a timer-event. |
| 4250 | Now we always run timers directly. */ | 4250 | Now we always run timers directly. */ |
| 4251 | 4251 | ||
| 4252 | static int in_timer_check = 0; | ||
| 4253 | |||
| 4254 | EMACS_TIME | 4252 | EMACS_TIME |
| 4255 | timer_check (do_it_now) | 4253 | timer_check (do_it_now) |
| 4256 | int do_it_now; | 4254 | int do_it_now; |
| @@ -4263,11 +4261,6 @@ timer_check (do_it_now) | |||
| 4263 | EMACS_SET_SECS (nexttime, -1); | 4261 | EMACS_SET_SECS (nexttime, -1); |
| 4264 | EMACS_SET_USECS (nexttime, -1); | 4262 | EMACS_SET_USECS (nexttime, -1); |
| 4265 | 4263 | ||
| 4266 | if (in_timer_check) | ||
| 4267 | return nexttime; | ||
| 4268 | |||
| 4269 | in_timer_check = 1; | ||
| 4270 | |||
| 4271 | /* Always consider the ordinary timers. */ | 4264 | /* Always consider the ordinary timers. */ |
| 4272 | timers = Vtimer_list; | 4265 | timers = Vtimer_list; |
| 4273 | /* Consider the idle timers only if Emacs is idle. */ | 4266 | /* Consider the idle timers only if Emacs is idle. */ |
| @@ -4426,7 +4419,6 @@ timer_check (do_it_now) | |||
| 4426 | return the amount of time to wait before it is ripe. */ | 4419 | return the amount of time to wait before it is ripe. */ |
| 4427 | { | 4420 | { |
| 4428 | UNGCPRO; | 4421 | UNGCPRO; |
| 4429 | in_timer_check = 0; | ||
| 4430 | return difference; | 4422 | return difference; |
| 4431 | } | 4423 | } |
| 4432 | } | 4424 | } |
| @@ -4434,7 +4426,6 @@ timer_check (do_it_now) | |||
| 4434 | /* No timers are pending in the future. */ | 4426 | /* No timers are pending in the future. */ |
| 4435 | /* Return 0 if we generated an event, and -1 if not. */ | 4427 | /* Return 0 if we generated an event, and -1 if not. */ |
| 4436 | UNGCPRO; | 4428 | UNGCPRO; |
| 4437 | in_timer_check = 0; | ||
| 4438 | return nexttime; | 4429 | return nexttime; |
| 4439 | } | 4430 | } |
| 4440 | 4431 | ||