Changeset 4133

Timestamp:

08/01/06 23:23:11 (2 years ago)

Author:

miyoshi

Message:

* process.c (wait_reading_process_output): Revert the last change.

* mw32term.c (MW32_read_socket): Ignore the 2nd argument
`expected'. Refer to 7443.

* keyboard.c (kbd_buffer_get_event): Remove `have_input'.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-08-01  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * process.c (wait_reading_process_output): Revert the last change.
+
+        * mw32term.c (MW32_read_socket): Ignore the 2nd argument
+        `expected'. Refer to [meadow-develop: 7443].
+
+        * keyboard.c (kbd_buffer_get_event): Remove `have_input'.
+
-2006-07-31  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/keyboard.c

@@ -3942 +3942 @@
-  Lisp_Object obj;
-#ifdef MEADOW
-  int have_input;
-  extern void note_sync_event (void);
-#endif
@@ -3996 +3995 @@
-            {
-              note_sync_event ();
-have_input = 
-               
-               
+
+   
+   
-            }
-#else
@@ -4010 +4009 @@
-        {
-          note_sync_event ();
-
-
+
-        }
-#else
@@ -4018 +4016 @@
-#endif
-      if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
-#ifdef MEADOW
-        read_avail_input (have_input);
-#else
-        /* Pass 1 for EXPECT since we just waited to have input.  */
-        read_avail_input (1);
-#endif
-#endif /* not VMS */
-    }

trunk/src/mw32term.c

@@ -4534 +4534 @@
-  if (expected)
-    {
+#if 0
+      /* Ignore `expected'. Refer to [meadow-develop: 7443]. */
-      ResetEvent (keyboard_handle);
-      WaitForSingleObject (keyboard_handle, INFINITE);
+#endif
-    }
-  return 0;

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)
-        {