summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/term.c18
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 7 deletions
diff --git a/src/term.c b/src/term.c
index c7e8ddf0c5..5bae1f2ddd 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3496,19 +3496,23 @@ settmode(int tmode)
#endif
#ifdef FEAT_MOUSE_TTY
if (tmode != TMODE_RAW)
- mch_setmouse(FALSE); /* switch mouse off */
+ mch_setmouse(FALSE); // switch mouse off
#endif
- if (tmode != TMODE_RAW)
- out_str(T_BD); /* disable bracketed paste mode */
+ if (termcap_active)
+ {
+ if (tmode != TMODE_RAW)
+ out_str(T_BD); // disable bracketed paste mode
+ else
+ out_str(T_BE); // enable bracketed paste mode (should
+ // be before mch_settmode().
+ }
out_flush();
- mch_settmode(tmode); /* machine specific function */
+ mch_settmode(tmode); // machine specific function
cur_tmode = tmode;
#ifdef FEAT_MOUSE
if (tmode == TMODE_RAW)
- setmouse(); /* may switch mouse on */
+ setmouse(); // may switch mouse on
#endif
- if (tmode == TMODE_RAW)
- out_str(T_BE); /* enable bracketed paste mode */
out_flush();
}
#ifdef FEAT_TERMRESPONSE
diff --git a/src/version.c b/src/version.c
index 234f4bf04d..48e8d99e89 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1198,
+/**/
1197,
/**/
1196,