diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-08-22 22:44:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-22 22:44:11 +0200 |
| commit | 73170917f14d1b0d919c65fbc0a9d011b87d94da (patch) | |
| tree | 6ee99f847cbd30b9be296122e3d2ecc501cd5bdf /src | |
| parent | 093165c899f1620543844d1c1a7a05975697c286 (diff) | |
| download | vim-git-73170917f14d1b0d919c65fbc0a9d011b87d94da.tar.gz | |
patch 8.2.3367: Vim9: :@r executing a register is inconsistentv8.2.3367
Problem: Vim9: :@r executing a register is inconsistent.
Solution: Use "@r" as the start of an expression. (issue #8779)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_docmd.c | 21 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 32 insertions, 7 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 4eee8fe9c..85df6cdc2 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3432,12 +3432,23 @@ find_ex_command( int heredoc; char_u *swp; - if (*eap->cmd == '&') + if (*eap->cmd == '&' || (eap->cmd[0] == '@' + && (valid_yank_reg(eap->cmd[1], FALSE) + || eap->cmd[1] == '@'))) { - p = to_name_end(eap->cmd + 1, FALSE); + if (*eap->cmd == '&') + { + p = eap->cmd + 1; + if (STRNCMP("l:", p, 2) == 0 || STRNCMP("g:", p, 2) == 0) + p += 2; + p = to_name_end(p, FALSE); + } + else + p = eap->cmd + 2; if (ends_excmd(*skipwhite(p))) { - // "&option <NL>" is the start of an expression. + // "&option <NL>" and "@r <NL>" is the start of an + // expression. eap->cmdidx = CMD_eval; return eap->cmd; } @@ -3548,10 +3559,6 @@ find_ex_command( // "&opt = expr" // "var = expr" where "var" is a variable name or we are skipping // (variable declaration might have been skipped). - if (*eap->cmd == '@') - p = eap->cmd + 2; - else if (*eap->cmd == '&') - p = skiptowhite_esc(eap->cmd + 1); oplen = assignment_len(skipwhite(p), &heredoc); if (oplen > 0) { diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 4b3cbc678..ec845ea40 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -537,6 +537,22 @@ def Test_option_use_linebreak() CheckDefAndScriptSuccess(lines) enddef +def Test_register_use_linebreak() + var lines =<< trim END + new + @a = 'one' + @a->setline(1) + @b = 'two' + @b ->setline(2) + @c = 'three' + @c + ->setline(3) + assert_equal(['one', 'two', 'three'], getline(1, '$')) + bwipe! + END + CheckDefAndScriptSuccess(lines) +enddef + def Test_skipped_expr_linebreak() if 0 var x = [] diff --git a/src/version.c b/src/version.c index ca5402fda..619c840f9 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3367, +/**/ 3366, /**/ 3365, |