Mercurial > vim
diff src/ex_getln.c @ 17178:40c4cb095d53 v8.1.1588
patch 8.1.1588: in :let-heredoc line continuation is recognized
commit https://github.com/vim/vim/commit/e96a2498f9a2d3e93ac07431f6d4afd77f30afdf
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jun 25 04:12:16 2019 +0200
patch 8.1.1588: in :let-heredoc line continuation is recognized
Problem: In :let-heredoc line continuation is recognized.
Solution: Do not consume line continuation. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/4580)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 25 Jun 2019 04:15:08 +0200 |
| parents | da2bb80cd838 |
| children | a9556c0ba457 |
line wrap: on
line diff
--- 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) {