aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2012-08-06 18:09:02 +0200
committerJan Djärv2012-08-06 18:09:02 +0200
commit4d365fa4cc083c4f84d1af8bcefc8852c9530307 (patch)
tree70b10e57ae1ca624a3704d6120b004666a5c9321 /src
parentdd86bd8258e894a4f2b3a34bf273201bd8a7037d (diff)
downloademacs-4d365fa4cc083c4f84d1af8bcefc8852c9530307.tar.gz
emacs-4d365fa4cc083c4f84d1af8bcefc8852c9530307.zip
* keyboard.c (timer_check_2): Add break so timer_check returns next timeout.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5ca15556b14..3eb47219f30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-08-06 Jan Djärv <jan.h.d@swipnet.se>
2
3 * keyboard.c (timer_check_2): Add break so timer_check returns next
4 timeout.
5
12012-08-06 Dmitry Antipov <dmantipov@yandex.ru> 62012-08-06 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Fix Windows build errors introduced after converting to WGET and WSET. 8 Fix Windows build errors introduced after converting to WGET and WSET.
diff --git a/src/keyboard.c b/src/keyboard.c
index 758085d3862..49ea1682400 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4459,6 +4459,7 @@ timer_check_2 (void)
4459 } 4459 }
4460 4460
4461 nexttime = make_emacs_time (0, 0); 4461 nexttime = make_emacs_time (0, 0);
4462 break;
4462 } 4463 }
4463 else 4464 else
4464 /* When we encounter a timer that is still waiting, 4465 /* When we encounter a timer that is still waiting,