aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-03-05 17:33:27 +0000
committerRichard M. Stallman1996-03-05 17:33:27 +0000
commit5d6c2aa300959bbb694de29a9d9f9f7f096e03df (patch)
tree00ee73c2fe0501af39abcc964d709e75ccab43af /src
parentf80bd2d7b25691d8200b1a691964f601551bcf41 (diff)
downloademacs-5d6c2aa300959bbb694de29a9d9f9f7f096e03df.tar.gz
emacs-5d6c2aa300959bbb694de29a9d9f9f7f096e03df.zip
(wait_reading_process_input):
Pass DO_DISPLAY to detect_input_pending_run_timers. (Fopen_network_stream): Set immediate_quit around gethostbyname.
Diffstat (limited to 'src')
-rw-r--r--src/process.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index 9b244d6d5c8..c9c7aa79545 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1670,7 +1670,10 @@ Fourth arg SERVICE is name of the service desired, or an integer\n\
1670#ifdef TRY_AGAIN 1670#ifdef TRY_AGAIN
1671 h_errno = 0; 1671 h_errno = 0;
1672#endif 1672#endif
1673 immediate_quit = 1;
1674 QUIT;
1673 host_info_ptr = gethostbyname (XSTRING (host)->data); 1675 host_info_ptr = gethostbyname (XSTRING (host)->data);
1676 immediate_quit = 0;
1674#ifdef TRY_AGAIN 1677#ifdef TRY_AGAIN
1675 if (! (host_info_ptr == 0 && h_errno == TRY_AGAIN)) 1678 if (! (host_info_ptr == 0 && h_errno == TRY_AGAIN))
1676#endif 1679#endif
@@ -2228,10 +2231,10 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2228 } 2231 }
2229 2232
2230 if ((XINT (read_kbd) > 0 || wait_for_cell) 2233 if ((XINT (read_kbd) > 0 || wait_for_cell)
2231 && detect_input_pending_run_timers ()) 2234 && detect_input_pending_run_timers (do_display))
2232 { 2235 {
2233 swallow_events (do_display); 2236 swallow_events (do_display);
2234 if (detect_input_pending_run_timers ()) 2237 if (detect_input_pending_run_timers (do_display))
2235 break; 2238 break;
2236 } 2239 }
2237 2240