summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-31 13:09:47 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-31 13:09:47 +0200
commit928eec649b8af389de0fdb7aba2034d27df3e058 (patch)
treea480df7582cc02e72e6e2138c5b7b761988f53aa /src
parentebe9d34aa07037cff2188a8dd424ee1f59cbb0bf (diff)
patch 8.2.0856: CTRL-S stops outputv8.2.0856
Problem: CTRL-S stops output. Solution: Invert the IXON flag. (closes #6166)
Diffstat (limited to 'src')
-rw-r--r--src/os_unix.c6
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index e1296c4b55..c6ba2499bd 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3481,10 +3481,8 @@ mch_settmode(tmode_T tmode)
if (tmode == TMODE_RAW)
{
// ~ICRNL enables typing ^V^M
- tnew.c_iflag &= ~ICRNL;
- // Do not make CTRL-S stop output, for most users it is unexpected and
- // is hardly ever useful.
- tnew.c_iflag |= IXON;
+ // ~IXON disables CTRL-S stopping output, so that it can be mapped.
+ tnew.c_iflag &= ~(ICRNL | IXON);
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 b3aa840272..c4728196e4 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 */
/**/
+ 856,
+/**/
855,
/**/
854,