From 1ce4c6398ea453a66f6943552b0ec866a690e9b1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 19 Aug 2013 22:13:47 -0600 Subject: [PATCH] fix up some merge errors in process.c remove a dead function clean up a fixme I added in create_pty during the merge --- src/process.c | 18 +----------------- 1 file changed, 1 insertion(+), 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) } } -/* FD is no longer an input descriptor; update max_input_desc accordingly. */ - -static void -delete_input_desc (int fd) -{ - if (fd == max_input_desc) - { - do - fd--; - while (0 <= fd && ! (FD_ISSET (fd, &input_wait_mask) - || FD_ISSET (fd, &write_mask))); - - max_input_desc = fd; - } -} - /* Stop monitoring file descriptor FD for when write is possible. */ void @@ -2155,7 +2139,7 @@ create_pty (Lisp_Object process) pset_status (p, Qrun); setup_process_coding_systems (process); - fixme; + add_non_keyboard_read_fd (pty_fd); pset_tty_name (p, build_string (pty_name)); } -- 2.11.4.GIT