summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtkoba <69125751+xtkoba@users.noreply.github.com>2022-02-27 12:31:52 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-27 12:31:52 +0000
commitcbef12e60b2c5a4f026172ab9873deaab2e70cf2 (patch)
tree936f9765ee92065c331c07bbe4649a17167ba094
parent6caeda2fce4bccac2dd43ca9fee1d32ee96b708d (diff)
downloadvim-git-cbef12e60b2c5a4f026172ab9873deaab2e70cf2.tar.gz
patch 8.2.4480: suspending with CTRL-Z does not work on Androidv8.2.4480
Problem: Suspending with CTRL-Z does not work on Android. Solution: Do not handle SIGTSTP. (closes #9854)
-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 d36eb46a2..58f8276fb 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -887,8 +887,10 @@ sig_tstp SIGDEFARG(sigarg)
else
got_tstp = TRUE;
- // this is not required on all systems, but it doesn't hurt anybody
+#ifndef __ANDROID__
+ // this is not required on all systems
signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp);
+#endif
SIGRETURN;
}
#endif
diff --git a/src/version.c b/src/version.c
index a8c0bdc55..b9b6aac63 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4480,
+/**/
4479,
/**/
4478,