mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

* process.c: Reapply 2006-08-01 change.

Browse source
This commit is contained in:
Chong Yidong 2006-08-05 01:38:42 +00:00
parent 092869b973
commit 42ec1561cf
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/process.c
View file

@ -4158,6 +4158,14 @@ server_accept_connection (server, channel)
when not inside wait_reading_process_output. */
static int waiting_for_user_input_p;
static Lisp_Object
wait_reading_process_output_unwind (data)
Lisp_Object data;
{
waiting_for_user_input_p = XINT (data);
return Qnil;
}
/* This is here so breakpoints can be put on it. */
static void
wait_reading_process_output_1 ()
@ -4240,11 +4248,7 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
EMACS_TIME timeout, end_time;
int wait_channel = -1;
int got_some_input = 0;
/* We can't record_unwind_protect here because after the
set_waiting_for_input call, C-g (interrupt_signal) would run
throw_to_read_char instead of Fsignal, which means unbind_to
doesn't get called. */
int saved_waiting_for_user_input_p = waiting_for_user_input_p;
int count = SPECPDL_INDEX ();
FD_ZERO (&Available);
#ifdef NON_BLOCKING_CONNECT
@ -4255,6 +4259,8 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
if (wait_proc != NULL)
wait_channel = XINT (wait_proc->infd);
record_unwind_protect (wait_reading_process_output_unwind,
make_number (waiting_for_user_input_p));
waiting_for_user_input_p = read_kbd;
/* Since we may need to wait several times,
@ -4881,7 +4887,7 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
} /* end for each file descriptor */
} /* end while exit conditions not met */
waiting_for_user_input_p = saved_waiting_for_user_input_p;
unbind_to (count, Qnil);
/* If calling from keyboard input, do not quit
since we want to return C-g as an input character.