diff options
| author | Kim F. Storm | 2004-05-13 23:07:07 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-05-13 23:07:07 +0000 |
| commit | 855448dc19acdc72ca3a233ce6b9c7eaeda26fff (patch) | |
| tree | 65ef66f94f74468b110229ed3e47b52393dbeed1 | |
| parent | b51a51b94c3563d9c743ef0a5d9ea4400344f773 (diff) | |
| download | emacs-855448dc19acdc72ca3a233ce6b9c7eaeda26fff.tar.gz emacs-855448dc19acdc72ca3a233ce6b9c7eaeda26fff.zip | |
(wait_reading_process_input): Make reentrant.
Make Available and Connecting non-static. Save and restore value
of waiting_for_user_input_p.
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index bbfc06c3082..463d56ffb3d 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4018,8 +4018,8 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4018 | int do_display; | 4018 | int do_display; |
| 4019 | { | 4019 | { |
| 4020 | register int channel, nfds; | 4020 | register int channel, nfds; |
| 4021 | static SELECT_TYPE Available; | 4021 | SELECT_TYPE Available; |
| 4022 | static SELECT_TYPE Connecting; | 4022 | SELECT_TYPE Connecting; |
| 4023 | int check_connect, check_delay, no_avail; | 4023 | int check_connect, check_delay, no_avail; |
| 4024 | int xerrno; | 4024 | int xerrno; |
| 4025 | Lisp_Object proc; | 4025 | Lisp_Object proc; |
| @@ -4030,6 +4030,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4030 | /* Either nil or a cons cell, the car of which is of interest and | 4030 | /* Either nil or a cons cell, the car of which is of interest and |
| 4031 | may be changed outside of this routine. */ | 4031 | may be changed outside of this routine. */ |
| 4032 | Lisp_Object wait_for_cell = Qnil; | 4032 | Lisp_Object wait_for_cell = Qnil; |
| 4033 | int saved_waiting_for_user_input_p = waiting_for_user_input_p; | ||
| 4033 | 4034 | ||
| 4034 | FD_ZERO (&Available); | 4035 | FD_ZERO (&Available); |
| 4035 | FD_ZERO (&Connecting); | 4036 | FD_ZERO (&Connecting); |
| @@ -4643,7 +4644,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4643 | } /* end for each file descriptor */ | 4644 | } /* end for each file descriptor */ |
| 4644 | } /* end while exit conditions not met */ | 4645 | } /* end while exit conditions not met */ |
| 4645 | 4646 | ||
| 4646 | waiting_for_user_input_p = 0; | 4647 | waiting_for_user_input_p = saved_waiting_for_user_input_p; |
| 4647 | 4648 | ||
| 4648 | /* If calling from keyboard input, do not quit | 4649 | /* If calling from keyboard input, do not quit |
| 4649 | since we want to return C-g as an input character. | 4650 | since we want to return C-g as an input character. |