diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-04-15 19:46:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 19:46:17 +0800 |
| commit | 62b7b1daf37abbe4d72838933569fefa970aa2e4 (patch) | |
| tree | 3e04748f05198e3e971e386bf6270cbc65d79413 /src/nvim/eval/userfunc.c | |
| parent | 071c455420dec7992a06a55e8bd443b769ded369 (diff) | |
| parent | 57221e0d11d1c24bc2abada7559a1d20c5090b62 (diff) | |
| download | rneovim-62b7b1daf37abbe4d72838933569fefa970aa2e4.tar.gz rneovim-62b7b1daf37abbe4d72838933569fefa970aa2e4.tar.bz2 rneovim-62b7b1daf37abbe4d72838933569fefa970aa2e4.zip | |
Merge pull request #23105 from zeertzjq/vim-8.2.4770
vim-patch:8.2.{4770,4783,4840,4883,4930,4934},9.0.0104: interpolated string
Diffstat (limited to 'src/nvim/eval/userfunc.c')
| -rw-r--r-- | src/nvim/eval/userfunc.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 67c73924c8..67b1e53a35 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -2483,10 +2483,19 @@ void ex_function(exarg_T *eap) && (!ASCII_ISALNUM(p[2]) || (p[2] == 't' && !ASCII_ISALNUM(p[3]))))) { p = skipwhite(arg + 3); - if (strncmp(p, "trim", 4) == 0) { - // Ignore leading white space. - p = skipwhite(p + 4); - heredoc_trimmed = xstrnsave(theline, (size_t)(skipwhite(theline) - theline)); + while (true) { + if (strncmp(p, "trim", 4) == 0) { + // Ignore leading white space. + p = skipwhite(p + 4); + heredoc_trimmed = xstrnsave(theline, (size_t)(skipwhite(theline) - theline)); + continue; + } + if (strncmp(p, "eval", 4) == 0) { + // Ignore leading white space. + p = skipwhite(p + 4); + continue; + } + break; } skip_until = xstrnsave(p, (size_t)(skiptowhite(p) - p)); do_concat = false; |