summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-15 21:08:09 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-15 21:08:09 +0100
commit34f99584c73f91bcc8ca5236557a2a09335e1e43 (patch)
treec4cc954e37a7683656eeddc2f8552c2d77ec4fd0
parent8bea171f154845046239c61bdef50a8e0f12f643 (diff)
patch 8.2.5103: build fails with small featuresv8.2.5103
Problem: Build fails with small features. Solution: Add #ifdef. Skip test on MS-Windows.
-rw-r--r--src/indent.c2
-rw-r--r--src/testdir/test_retab.vim3
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/indent.c b/src/indent.c
index af23757a4a..73eb12c49b 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1783,7 +1783,9 @@ ex_retab(exarg_T *eap)
emsg(_(e_resulting_text_too_long));
// when not inside a try/catch set got_int to break out of any
// loop
+#ifdef FEAT_EVAL
if (trylevel == 0)
+#endif
got_int = TRUE;
break;
}
diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim
index 2d96042dc1..4e3d0fd445 100644
--- a/src/testdir/test_retab.vim
+++ b/src/testdir/test_retab.vim
@@ -105,6 +105,9 @@ func Test_retab_endless()
endfunc
func Test_nocatch_retab_endless()
+ " FIXME: why does this hang on MS-Windows?
+ CheckNotMSWindows
+
" not inside try/catch an interrupt is generated to get out of loops
new
call setline(1, "\t0\t")
diff --git a/src/version.c b/src/version.c
index 2f6152130d..e3c52b71f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5103,
+/**/
5102,
/**/
5101,