patch 8.2.1805: Unix: terminal mode changed when using ":shell"
Problem: Unix: terminal mode changed when using ":shell".
Solution: Avoid calling settmode() when not needed. (issue #7079)
diff --git a/src/os_unix.c b/src/os_unix.c
index 6f7a9a4..2afe1ba 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -585,6 +585,7 @@
mch_delay(long msec, int flags)
{
tmode_T old_tmode;
+ int call_settmode;
#ifdef FEAT_MZSCHEME
long total = msec; // remember original value
#endif
@@ -596,10 +597,13 @@
// shell may produce SIGQUIT).
// Only do this if sleeping for more than half a second.
in_mch_delay = TRUE;
- old_tmode = mch_cur_tmode;
- if (mch_cur_tmode == TMODE_RAW
- && (msec > 500 || (flags & MCH_DELAY_SETTMODE)))
+ call_settmode = mch_cur_tmode == TMODE_RAW
+ && (msec > 500 || (flags & MCH_DELAY_SETTMODE));
+ if (call_settmode)
+ {
+ old_tmode = mch_cur_tmode;
settmode(TMODE_SLEEP);
+ }
/*
* Everybody sleeps in a different way...
@@ -653,7 +657,7 @@
while (total > 0);
#endif
- if (msec > 500 || (flags & MCH_DELAY_SETTMODE))
+ if (call_settmode)
settmode(old_tmode);
in_mch_delay = FALSE;
}
diff --git a/src/version.c b/src/version.c
index cfd0d54..b8b9917 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1805,
+/**/
1804,
/**/
1803,