aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.1588: in :let-heredoc line continuation is recognized

Browse Source 
Problem:    In :let-heredoc line continuation is recognized.
Solution:   Do not consume line continuation. (Ozaki Kiichi, closes #4580)
This commit is contained in:
Bram Moolenaar
2019-06-25 04:12:16 +02:00
parent 2b044ffb5a
commit e96a2498f9
20 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ex_getln.c
View File

@@ -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)
{