aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-07-31 00:00:24 +0000
committerRichard M. Stallman1994-07-31 00:00:24 +0000
commit5e7e1da2fed85d03ca1bbee7bf9addcc1fd3f1d1 (patch)
treecbb276d3dc7033f909197b8b8434dad73648a985 /src
parentb7c2e3d825fb5eb0549989e4da08ba66e668393f (diff)
downloademacs-5e7e1da2fed85d03ca1bbee7bf9addcc1fd3f1d1.tar.gz
emacs-5e7e1da2fed85d03ca1bbee7bf9addcc1fd3f1d1.zip
(create_process): Set default handling for SIGINT, etc.
(wait_reading_process_input): Fix previous change.
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 e05c2601a6f..620ef552a07 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1409,6 +1409,9 @@ create_process (process, new_argv, current_dir)
1409#endif /* not BSD4_1 */ 1409#endif /* not BSD4_1 */
1410#endif /* SIGCHLD */ 1410#endif /* SIGCHLD */
1411 1411
1412 signal (SIGINT, SIG_DFL);
1413 signal (SIGQUIT, SIG_DFL);
1414
1412 if (pty_flag) 1415 if (pty_flag)
1413 child_setup_tty (xforkout); 1416 child_setup_tty (xforkout);
1414 child_setup (xforkin, xforkout, xforkout, 1417 child_setup (xforkin, xforkout, xforkout,
@@ -1950,7 +1953,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
1950 /* Wait till there is something to do */ 1953 /* Wait till there is something to do */
1951 1954
1952 Available = input_wait_mask; 1955 Available = input_wait_mask;
1953 if (! XINT (read_kbd) || wait_for_cell != 0) 1956 if (! XINT (read_kbd) && wait_for_cell == 0)
1954 FD_CLR (keyboard_descriptor, &Available); 1957 FD_CLR (keyboard_descriptor, &Available);
1955 1958
1956 /* If frame size has changed or the window is newly mapped, 1959 /* If frame size has changed or the window is newly mapped,
@@ -2035,7 +2038,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2035 2038
2036 /* We used to do this if wait_for_cell, 2039 /* We used to do this if wait_for_cell,
2037 but that caused infinite recursion in selection request events. */ 2040 but that caused infinite recursion in selection request events. */
2038 if ((XINT (read_kbd)) 2041 if ((XINT (read_kbd) || wait_for_cell)
2039 && detect_input_pending ()) 2042 && detect_input_pending ())
2040 { 2043 {
2041 swallow_events (); 2044 swallow_events ();