summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_unix.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 993068042..0af6016bb 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -868,10 +868,11 @@ sig_tstp SIGDEFARG(sigarg)
signal(SIGTSTP, ignore_sigtstp ? SIG_IGN : SIG_DFL);
raise(sigarg);
}
+ else
+ got_tstp = TRUE;
// this is not required on all systems, but it doesn't hurt anybody
signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp);
- got_tstp = TRUE;
SIGRETURN;
}
#endif
@@ -6414,6 +6415,7 @@ select_eintr:
if (got_tstp && !in_mch_suspend)
{
exarg_T ea;
+
ea.forceit = TRUE;
ex_stop(&ea);
got_tstp = FALSE;
diff --git a/src/version.c b/src/version.c
index 5eacff8af..3e693de1b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4195,
+/**/
4194,
/**/
4193,