diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-16 19:56:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-16 19:56:12 +0200 |
| commit | 7a66a17190f2f64688a697ea29d58388612122ce (patch) | |
| tree | 0c9eb0d28922da3a592ad60113861f42143c5ad2 | |
| parent | ffdf8adfa8108d4765fdc68abbd2fe49a4292b25 (diff) | |
| download | vim-git-7a66a17190f2f64688a697ea29d58388612122ce.tar.gz | |
patch 8.2.1853: "to_f" is recognized at "topleft" modifierv8.2.1853
Problem: "to_f" is recognized at "topleft" modifier.
Solution: Do not recognize modifer when "_" follows. (closes #7019)
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_assign.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 1fc67eaec..66c0b667a 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3123,7 +3123,7 @@ checkforcmd( for (i = 0; cmd[i] != NUL; ++i) if (((char_u *)cmd)[i] != (*pp)[i]) break; - if (i >= len && !isalpha((*pp)[i])) + if (i >= len && !isalpha((*pp)[i]) && (*pp)[i] != '_') { *pp = skipwhite(*pp + i); return TRUE; diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index cf06b5cd8..478a1e5cd 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -454,7 +454,6 @@ def Test_assignment_local() enddef def Test_assignment_default() - # Test default values. var thebool: bool assert_equal(v:false, thebool) @@ -571,6 +570,10 @@ def Test_assignment_vim9script() assert_equal(43, w) var t: number = 44 assert_equal(44, t) + + var to_var = 0 + to_var = 3 + assert_equal(3, to_var) END CheckScriptSuccess(lines) diff --git a/src/version.c b/src/version.c index 266c7c135..5aa3cf669 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1853, +/**/ 1852, /**/ 1851, |