diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c89fa60a5b5..76e195605fd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-02-16 Kelly Dean <kelly@prtime.org> | ||
| 2 | |||
| 3 | * src/keyboard.c (timer_check_2): Fix incorrect comment. | ||
| 4 | |||
| 1 | 2015-02-14 Martin Rudalics <rudalics@gmx.at> | 5 | 2015-02-14 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * xterm.c (x_frame_normalize_before_maximize): Fix doc-string. | 7 | * xterm.c (x_frame_normalize_before_maximize): Fix doc-string. |
diff --git a/src/keyboard.c b/src/keyboard.c index bcb51cfa1f2..ac70062a79b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -4441,7 +4441,7 @@ timer_check_2 (Lisp_Object timers, Lisp_Object idle_timers) | |||
| 4441 | /* Set TIMER and TIMER_DIFFERENCE | 4441 | /* Set TIMER and TIMER_DIFFERENCE |
| 4442 | based on the next ordinary timer. | 4442 | based on the next ordinary timer. |
| 4443 | TIMER_DIFFERENCE is the distance in time from NOW to when | 4443 | TIMER_DIFFERENCE is the distance in time from NOW to when |
| 4444 | this timer becomes ripe (negative if it's already ripe). | 4444 | this timer becomes ripe. |
| 4445 | Skip past invalid timers and timers already handled. */ | 4445 | Skip past invalid timers and timers already handled. */ |
| 4446 | if (CONSP (timers)) | 4446 | if (CONSP (timers)) |
| 4447 | { | 4447 | { |