summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-30 20:05:02 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-30 20:05:02 +0200
commitd6cd5ffade84a1054fed23079133af3b837033bf (patch)
treefb4e4d3213671bbda256d7118f37ce255f9db2cf
parentf4ae6b245a54f11dd967d06b80f30e5abf55fb82 (diff)
downloadvim-git-d6cd5ffade84a1054fed23079133af3b837033bf.tar.gz
patch 8.2.0852: cannot map CTRL-S on some systemsv8.2.0852
Problem: Cannot map CTRL-S on some systems. Solution: Do not use CTRL-S for flow control.
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 3464426c3..e1296c4b5 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3482,11 +3482,9 @@ mch_settmode(tmode_T tmode)
{
// ~ICRNL enables typing ^V^M
tnew.c_iflag &= ~ICRNL;
-# ifdef IXON_NOT_USED
// Do not make CTRL-S stop output, for most users it is unexpected and
// is hardly ever useful.
tnew.c_iflag |= IXON;
-# endif
tnew.c_lflag &= ~(ICANON | ECHO | ISIG | ECHOE
# if defined(IEXTEN) && !defined(__MINT__)
| IEXTEN // IEXTEN enables typing ^V on SOLARIS
diff --git a/src/version.c b/src/version.c
index da3169959..f60d1a491 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 852,
+/**/
851,
/**/
850,