summaryrefslogtreecommitdiffstats
path: root/src/ex_getln.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-25 04:12:16 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-25 04:12:16 +0200
commite96a2498f9a2d3e93ac07431f6d4afd77f30afdf (patch)
tree9395a92f2de9f49abe63c7fc9f5fe26b1396fb47 /src/ex_getln.c
parent2b044ffb5ada77e6fa89779d6532ea9fae3fe029 (diff)
patch 8.1.1588: in :let-heredoc line continuation is recognizedv8.1.1588
Problem: In :let-heredoc line continuation is recognized. Solution: Do not consume line continuation. (Ozaki Kiichi, closes #4580)
Diffstat (limited to 'src/ex_getln.c')
-rw-r--r--src/ex_getln.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 4514540d80..303786cc50 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -838,7 +838,8 @@ cmdline_init(void)
getcmdline(
int firstc,
long count, // only used for incremental search
- int indent) // indent for inside conditionals
+ int indent, // indent for inside conditionals
+ int do_concat UNUSED)
{
return getcmdline_int(firstc, count, indent, TRUE);
}
@@ -2687,12 +2688,13 @@ correct_cmdspos(int idx, int cells)
getexline(
int c, /* normally ':', NUL for ":append" */
void *cookie UNUSED,
- int indent) /* indent for inside conditionals */
+ int indent, /* indent for inside conditionals */
+ int do_concat)
{
/* When executing a register, remove ':' that's in front of each line. */
if (exec_from_reg && vpeekc() == ':')
(void)vgetc();
- return getcmdline(c, 1L, indent);
+ return getcmdline(c, 1L, indent, do_concat);
}
/*
@@ -2706,7 +2708,8 @@ getexmodeline(
int promptc, /* normally ':', NUL for ":append" and '?' for
:s prompt */
void *cookie UNUSED,
- int indent) /* indent for inside conditionals */
+ int indent, /* indent for inside conditionals */
+ int do_concat UNUSED)
{
garray_T line_ga;
char_u *pend;
@@ -7409,7 +7412,7 @@ script_get(exarg_T *eap, char_u *cmd)
#ifdef FEAT_EVAL
eap->cstack->cs_looplevel > 0 ? -1 :
#endif
- NUL, eap->cookie, 0);
+ NUL, eap->cookie, 0, TRUE);
if (theline == NULL || STRCMP(end_pattern, theline) == 0)
{