2 files changed, 10 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 86605b97764..ed71ae9452b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-24  Daniel Colascione  <dancol@dancol.org>
+
+        * keyboard.c (read_char): Close race that resulted in lost events.
+
 2014-02-22  Glenn Morris  <rgm@gnu.org>
 
         * frame.c (frame-alpha-lower-limit, frame-resize-pixelwise):
diff --git a/src/keyboard.c b/src/keyboard.c
index 9dcb58ae66c..038ce6ea601 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2891,8 +2891,12 @@ read_char (int commandflag, Lisp_Object map,
     {
       c = read_decoded_event_from_main_queue (end_time, local_getcjmp,
                                               prev_event, used_mouse_menu);
-      if (end_time && timespec_cmp (*end_time, current_timespec ()) <= 0)
-        goto exit;
+      if (NILP(c) && end_time &&
+          timespec_cmp (*end_time, current_timespec ()) <= 0)
+        {
+          goto exit;
+        }
+
       if (EQ (c, make_number (-2)))
         {
           /* This is going to exit from read_char