summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-10-13 10:05:30 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-13 10:05:30 +0100
commitfff10d9a76099aa9b944f3c33a911127ca1a0c72 (patch)
treead8258085088c0b35a1cb17d41b1b3f8b7783141 /src
parente519eb41c1c12836b2d12aeb703bb04c7618a724 (diff)
downloadvim-git-fff10d9a76099aa9b944f3c33a911127ca1a0c72.tar.gz
patch 8.2.3502: cannot enter password in shell commandv8.2.3502
Problem: Cannot enter password in shell command. Solution: Revert patch 8.2.2919.
Diffstat (limited to 'src')
-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,