From: Tom Tromey <tromey@redhat.com>
Date: Tue, 20 Aug 2013 04:13:47 +0000 (-0600)
Subject: fix up some merge errors in process.c
X-Git-Tag: emacs-26.0.90~1144^2~17^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ce4c6398ea453a66f6943552b0ec866a690e9b1;p=emacs.git

fix up some merge errors in process.c

remove a dead function
clean up a fixme I added in create_pty during the merge
---

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