Changeset 4132

Timestamp:

07/31/06 08:16:22 (2 years ago)

Author:

miyoshi

Message:

* process.c (wait_reading_process_output): Reset `got_some_input'
when timeout has occured.

* keyboard.c (kbd_buffer_get_event): Call note_sync_event() even
if the end time is specified.
(kbd_buffer_get_event): Call read_avail_input() with the return
value of wait_reading_process_output().

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/keyboard.c (modified) (2 diffs)
• trunk/src/process.c (modified) (1 diff)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-07-31  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * process.c (wait_reading_process_output): Reset `got_some_input'
+        when timeout has occured.
+
+        * keyboard.c (kbd_buffer_get_event): Call note_sync_event() even
+        if the end time is specified.
+        (kbd_buffer_get_event): Call read_avail_input() with the return
+        value of wait_reading_process_output().
+
-2006-07-29  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/keyboard.c

@@ -3941 +3941 @@
-  register int c;
-  Lisp_Object obj;
+#ifdef MEADOW
+  int have_input;
+  extern void note_sync_event (void);
+#endif
-
-  if (noninteractive)
@@ -3989 +3993 @@
-            return Qnil;
-          else
+#ifdef MEADOW
+            {
+              note_sync_event ();
+              have_input = wait_reading_process_output (EMACS_SECS (duration),
+                                                        EMACS_USECS (duration),
+                                                        -1, 1, Qnil, NULL, 0);
+            }
+#else
-            wait_reading_process_output (EMACS_SECS (duration),
-                                         EMACS_USECS (duration), 
-                                         -1, 1, Qnil, NULL, 0);
+#endif
-        }
-      else
-#ifdef MEADOW
-        {
-extern void note_sync_event (void
-
-note_sync_event (
-
-
+  note_sync_event (
+
+                                           Qnil, NULL, 0
+
+
-        wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);
+
+#endif
+      if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
-#ifdef MEADOW
-
-
-
-
+
+
-        /* Pass 1 for EXPECT since we just waited to have input.  */
-        read_avail_input (1);
+#endif
-#endif /* not VMS */
-    }

trunk/src/process.c

@@ -4618 +4618 @@
-
-      if (time_limit && nfds == 0 && ! timeout_reduced_for_timers)
+#ifdef MEADOW
+        {
+        /* This is a temporary hack and should be removed soon.
+           Refer to [meadow-develop: 7431]. */
+        got_some_input = 0;
+#endif
-        /* We wanted the full specified time, so return now.  */
-        break;
+#ifdef MEADOW
+        }
+#endif
-      if (nfds < 0)
-        {