[Emacs-diffs] Changes to emacs/src/keyboard.c,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/08/05 11:59:51

Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -b -r1.863 -r1.864
--- keyboard.c  5 Aug 2006 01:38:21 -0000       1.863
+++ keyboard.c  5 Aug 2006 11:59:50 -0000       1.864
@@ -3954,14 +3954,16 @@
        {
          EMACS_TIME duration;
          EMACS_GET_TIME (duration);
-         EMACS_SUB_TIME (duration, *end_time, duration);
-         if (EMACS_TIME_NEG_P (duration))
-           return Qnil;
+         if (EMACS_TIME_GE (duration, *end_time))
+           return Qnil;        /* finished waiting */
          else
+           {
+             EMACS_SUB_TIME (duration, *end_time, duration);
            wait_reading_process_output (EMACS_SECS (duration),
                                         EMACS_USECS (duration), 
                                         -1, 1, Qnil, NULL, 0);
        }
+       }
       else
        wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);