summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-19 16:32:09 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-19 16:32:09 +0200
commitf398238a37522fed9a2e7915741d1ab14ccc81a0 (patch)
tree36b76af1bc1f6f2b7d904e31f7c133df7a696f01
parent6802cce407b8b181bcf3eafe701fa9f8a91f7a73 (diff)
downloadvim-git-f398238a37522fed9a2e7915741d1ab14ccc81a0.tar.gz
patch 8.2.1245: build failure in tiny versionv8.2.1245
Problem: Build failure in tiny version. Solution: Add #ifdef.
-rw-r--r--src/scriptfile.c10
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 55145733e..ce269a1cd 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1768,8 +1768,11 @@ getsourceline(int c UNUSED, void *cookie, int indent UNUSED, int do_concat)
if (sp->nextline != NULL
&& (*(p = skipwhite(sp->nextline)) == '\\'
|| (p[0] == '"' && p[1] == '\\' && p[2] == ' ')
+#ifdef FEAT_EVAL
|| (in_vim9script()
- && (*p == NUL || vim9_comment_start(p)))))
+ && (*p == NUL || vim9_comment_start(p)))
+#endif
+ ))
{
garray_T ga;
@@ -1798,8 +1801,11 @@ getsourceline(int c UNUSED, void *cookie, int indent UNUSED, int do_concat)
ga_concat(&ga, p + 1);
}
else if (!(p[0] == '"' && p[1] == '\\' && p[2] == ' ')
+#ifdef FEAT_EVAL
&& !(in_vim9script()
- && (*p == NUL || vim9_comment_start(p))))
+ && (*p == NUL || vim9_comment_start(p)))
+#endif
+ )
break;
/* drop a # comment or "\ comment line */
}
diff --git a/src/version.c b/src/version.c
index c8dab6521..24ce5e82c 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 */
/**/
+ 1245,
+/**/
1244,
/**/
1243,