summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorichizok <gclient.gaap@gmail.com>2022-03-13 17:27:38 +0000
committerBram Moolenaar <Bram@vim.org>2022-03-13 17:27:38 +0000
commit5f823d1e73bdcc9417581b6b3587648a5bb98709 (patch)
tree1e721c616e3e77febda1fa25b28dccc568374315
parent533870a98501fac2b51ef4bc489fac3a055a41a9 (diff)
downloadvim-git-5f823d1e73bdcc9417581b6b3587648a5bb98709.tar.gz
patch 8.2.4560: suspending with CTRL-Z does not work on DragonFlyBSDv8.2.4560
Problem: Suspending with CTRL-Z does not work on DragonFlyBSD. Solution: Adjust #ifdef. (Ozaki Kiichi, closes #9943)
-rw-r--r--src/os_unix.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index e617b128f..5b516e0e8 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -887,9 +887,9 @@ sig_tstp SIGDEFARG(sigarg)
else
got_tstp = TRUE;
-#if !defined(__ANDROID__) && !defined(__OpenBSD__)
- // This is not required on all systems. On some systems (at least Android
- // and OpenBSD) this breaks suspending with CTRL-Z.
+#if !defined(__ANDROID__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ // This is not required on all systems. On some systems (at least Android,
+ // OpenBSD, and DragonFlyBSD) this breaks suspending with CTRL-Z.
signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp);
#endif
SIGRETURN;
diff --git a/src/version.c b/src/version.c
index a8a8a6475..a1107934d 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 */
/**/
+ 4560,
+/**/
4559,
/**/
4558,