From bb41f093dde33efca8a7d5baf6eb1c364ea684c4 Mon Sep 17 00:00:00 2001
From: "Kim F. Storm" <storm@cua.dk>
Date: Thu, 19 Aug 2004 13:59:28 +0000
Subject: [PATCH] Adapt to new wait_reading_process_input args.

---
 src/dispnew.c  | 13 +++----------
 src/keyboard.c |  5 +----
 src/lisp.h     |  5 ++++-
 src/xselect.c  |  6 ++++--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/dispnew.c b/src/dispnew.c
index 8a713857273..0d2ce118e0f 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6331,12 +6331,7 @@ Emacs was built without floating point support.
   if (sec < 0 || (sec == 0 && usec == 0))
     return Qnil;
 
-  {
-    Lisp_Object zero;
-
-    XSETFASTINT (zero, 0);
-    wait_reading_process_input (sec, usec, zero, 0);
-  }
+  wait_reading_process_input (sec, usec, 0, 0, Qnil, NULL, 0);
 
   /* We should always have wait_reading_process_input; we have a dummy
      implementation for systems which don't support subprocesses.  */
@@ -6386,8 +6381,6 @@ Lisp_Object
 sit_for (sec, usec, reading, display, initial_display)
      int sec, usec, reading, display, initial_display;
 {
-  Lisp_Object read_kbd;
-
   swallow_events (display);
 
   if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro))
@@ -6403,8 +6396,8 @@ sit_for (sec, usec, reading, display, initial_display)
   gobble_input (0);
 #endif
 
-  XSETINT (read_kbd, reading ? -1 : 1);
-  wait_reading_process_input (sec, usec, read_kbd, display);
+  wait_reading_process_input (sec, usec, reading ? -1 : 1, display,
+			      Qnil, NULL, 0);
 
   return detect_input_pending () ? Qnil : Qt;
 }
diff --git a/src/keyboard.c b/src/keyboard.c
index 268d782e478..77b3886d809 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3899,10 +3899,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
 	break;
 #endif
       {
-	Lisp_Object minus_one;
-
-	XSETINT (minus_one, -1);
-	wait_reading_process_input (0, 0, minus_one, 1);
+	wait_reading_process_input (0, 0, -1, 1, Qnil, NULL, 0);
 
 	if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
 	  /* Pass 1 for EXPECT since we just waited to have input.  */
diff --git a/src/lisp.h b/src/lisp.h
index a0345653924..e4fd7ef2c16 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2964,7 +2964,10 @@ EXFUN (Fprocess_send_eof, 1);
 EXFUN (Fwaiting_for_user_input_p, 0);
 extern Lisp_Object Qprocessp;
 extern void kill_buffer_processes P_ ((Lisp_Object));
-extern int wait_reading_process_input P_ ((int, int, Lisp_Object, int));
+extern int wait_reading_process_input P_ ((int, int, int, int,
+					   Lisp_Object,
+					   struct Lisp_Process *,
+					   int));
 extern void deactivate_process P_ ((Lisp_Object));
 extern void add_keyboard_wait_descriptor P_ ((int));
 extern void delete_keyboard_wait_descriptor P_ ((int));
diff --git a/src/xselect.c b/src/xselect.c
index 7be238651a0..bf7b21cf323 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1109,7 +1109,8 @@ wait_for_property_change (location)
       secs = x_selection_timeout / 1000;
       usecs = (x_selection_timeout % 1000) * 1000;
       TRACE2 ("  Waiting %d secs, %d usecs", secs, usecs);
-      wait_reading_process_input (secs, usecs, property_change_reply, 0);
+      wait_reading_process_input (secs, usecs, 0, 0,
+				  property_change_reply, NULL, 0);
 
       if (NILP (XCAR (property_change_reply)))
 	{
@@ -1288,7 +1289,8 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
   secs = x_selection_timeout / 1000;
   usecs = (x_selection_timeout % 1000) * 1000;
   TRACE1 ("  Start waiting %d secs for SelectionNotify", secs);
-  wait_reading_process_input (secs, usecs, reading_selection_reply, 0);
+  wait_reading_process_input (secs, usecs, 0, 0,
+			      reading_selection_reply, NULL, 0);
   TRACE1 ("  Got event = %d", !NILP (XCAR (reading_selection_reply)));
 
   BLOCK_INPUT;
-- 
2.39.2