diff options
| author | LemonBoy <thatlemon@gmail.com> | 2023-09-02 21:52:05 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-02 21:52:05 +0200 |
| commit | 32f3461465a26192172734584c4cbab6e55e2b7f (patch) | |
| tree | 40126ef352030c558fa24a5b6b0b8b0394231b7f | |
| parent | c8a034210f043639f27b6f346c5a9933f17e7159 (diff) | |
patch 9.0.1850: Vim9: wrong line number where options setv9.0.1850
Problem: Vim9: wrong line number where options set
Solution: Set source line number earlier
closes: #13006
closes: #13013
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 338167e7b2..656185adad 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -4332,6 +4332,23 @@ def Test_option_set() set foldlevel& enddef +def Test_option_set_line_number() + var lines =<< trim END + vim9script + # line2 + # line3 + def F() + # line5 + &foldlevel = -128 + enddef + F() + END + v9.CheckScriptSuccess(lines) + + var res = execute('verbose set foldlevel') + assert_match(' foldlevel.*Last set from .*XScriptSuccess\d\+ line 6', res) +enddef + def Test_option_modifier() # legacy script allows for white space var lines =<< trim END diff --git a/src/version.c b/src/version.c index c94a450d0a..517e0504e9 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1850, +/**/ 1849, /**/ 1848, diff --git a/src/vim9execute.c b/src/vim9execute.c index 2fbce780f7..c29873c89c 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -3836,6 +3836,7 @@ exec_instructions(ectx_T *ectx) char_u *tofree = NULL; --ectx->ec_stack.ga_len; + SOURCING_LNUM = iptr->isn_lnum; tv = STACK_TV_BOT(0); if (tv->v_type == VAR_STRING) { @@ -3845,7 +3846,6 @@ exec_instructions(ectx_T *ectx) } else if (iptr->isn_type == ISN_STOREFUNCOPT) { - SOURCING_LNUM = iptr->isn_lnum; // If the option can be set to a function reference or // a lambda and the passed value is a function // reference, then convert it to the name (string) of |