diff options
| author | Tom Tromey | 2013-08-19 22:13:47 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-08-19 22:13:47 -0600 |
| commit | 1ce4c6398ea453a66f6943552b0ec866a690e9b1 (patch) | |
| tree | 06f4e806e53250c650b364c57f0900f381388abd /src/process.c | |
| parent | 6d75555c5cc3d2a629646cee7629e67530fa7a36 (diff) | |
| download | emacs-1ce4c6398ea453a66f6943552b0ec866a690e9b1.tar.gz emacs-1ce4c6398ea453a66f6943552b0ec866a690e9b1.zip | |
fix up some merge errors in process.c
remove a dead function
clean up a fixme I added in create_pty during the merge
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/process.c b/src/process.c index 91483e5839f..1d1741d8b7e 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -550,22 +550,6 @@ recompute_max_desc (void) | |||
| 550 | } | 550 | } |
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | /* FD is no longer an input descriptor; update max_input_desc accordingly. */ | ||
| 554 | |||
| 555 | static void | ||
| 556 | delete_input_desc (int fd) | ||
| 557 | { | ||
| 558 | if (fd == max_input_desc) | ||
| 559 | { | ||
| 560 | do | ||
| 561 | fd--; | ||
| 562 | while (0 <= fd && ! (FD_ISSET (fd, &input_wait_mask) | ||
| 563 | || FD_ISSET (fd, &write_mask))); | ||
| 564 | |||
| 565 | max_input_desc = fd; | ||
| 566 | } | ||
| 567 | } | ||
| 568 | |||
| 569 | /* Stop monitoring file descriptor FD for when write is possible. */ | 553 | /* Stop monitoring file descriptor FD for when write is possible. */ |
| 570 | 554 | ||
| 571 | void | 555 | void |
| @@ -2155,7 +2139,7 @@ create_pty (Lisp_Object process) | |||
| 2155 | pset_status (p, Qrun); | 2139 | pset_status (p, Qrun); |
| 2156 | setup_process_coding_systems (process); | 2140 | setup_process_coding_systems (process); |
| 2157 | 2141 | ||
| 2158 | fixme; | 2142 | add_non_keyboard_read_fd (pty_fd); |
| 2159 | 2143 | ||
| 2160 | pset_tty_name (p, build_string (pty_name)); | 2144 | pset_tty_name (p, build_string (pty_name)); |
| 2161 | } | 2145 | } |