diff --git a/src/os_unix.c b/src/os_unix.c index 20c61106f9..0a4f0e6981 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4775,11 +4775,6 @@ mch_call_shell_fork( // push stream discipline modules if (options & SHELL_COOKED) setup_slavepty(pty_slave_fd); -# ifdef TIOCSCTTY - // Try to become controlling tty (probably doesn't work, - // unless run by root) - ioctl(pty_slave_fd, TIOCSCTTY, (char *)NULL); -# endif } # endif set_default_child_environment(FALSE); diff --git a/src/version.c b/src/version.c index c1fdb649d4..a9a7b29f51 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2919, /**/ 2918, /**/