diff options
| -rw-r--r-- | src/os_unix.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 0af6016bb..a0189ea45 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1378,7 +1378,14 @@ set_signals(void) #ifdef SIGTSTP // See mch_init() for the conditions under which we ignore SIGTSTP. - signal(SIGTSTP, ignore_sigtstp ? SIG_IGN : (RETSIGTYPE (*)())sig_tstp); + // In the GUI default TSTP processing is OK. + // Checking both gui.in_use and gui.starting because gui.in_use is not set + // at this point (set after menus are displayed), but gui.starting is set. + signal(SIGTSTP, ignore_sigtstp ? SIG_IGN +# ifdef FEAT_GUI + : gui.in_use || gui.starting ? SIG_DFL +# endif + : (RETSIGTYPE (*)())sig_tstp); #endif #if defined(SIGCONT) signal(SIGCONT, sigcont_handler); diff --git a/src/version.c b/src/version.c index aa0910e0f..1ba9e1d02 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 */ /**/ + 4201, +/**/ 4200, /**/ 4199, |