summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-28 20:49:56 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-28 20:49:56 +0000
commit11ceb7d949e7c2fb36509a79dfe8df54fbdfa666 (patch)
treeb3a2ea02ca34fa4928607c0161bba0062e3559ee
parent8c697e3698e7dbe0a3c4524ac360b78ceb852b23 (diff)
patch 8.2.3928: heredoc test failsv8.2.3928
Problem: Heredoc test fails. Solution: Correct order of function arguments.
-rw-r--r--src/userfunc.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/userfunc.c b/src/userfunc.c
index c894c5896e..f79e4cdf40 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -174,8 +174,8 @@ one_function_arg(
get_function_line(
exarg_T *eap,
char_u **line_to_free,
- getline_opt_T getline_options,
- int indent)
+ int indent,
+ getline_opt_T getline_options)
{
char_u *theline;
@@ -242,7 +242,8 @@ get_function_args(
&& (*p == NUL || (VIM_ISWHITE(*whitep) && *p == '#')))
{
// End of the line, get the next one.
- char_u *theline = get_function_line(eap, line_to_free, 0, TRUE);
+ char_u *theline = get_function_line(eap, line_to_free, 0,
+ GETLINE_CONCAT_CONT);
if (theline == NULL)
break;
diff --git a/src/version.c b/src/version.c
index 4d8110510a..1dedcfecbb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3928,
+/**/
3927,
/**/
3926,