summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_unix.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index d192b6bcf..9dde754f3 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4806,6 +4806,11 @@ 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 1f292bbde..764015321 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3502,
+/**/
3501,
/**/
3500,