procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix up some merge errors in process.c

Browse source 
remove a dead function
clean up a fixme I added in create_pty during the merge
This commit is contained in:
Tom Tromey 2013-08-19 22:13:47 -06:00
parent 6d75555c5c
commit 1ce4c6398e
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/process.c
View file

@ -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));
}