# HG changeset patch # User Bram Moolenaar # Date 1595610005 -7200 # Node ID eec2d2120cdecd8ff4199fc9369c5d6b9a46d045 # Parent 0a87961c92262b9b9f06897c1e0c429e3175362b patch 8.2.1288: Vim9: cannot use mark in range Commit: https://github.com/vim/vim/commit/13e12b8a3c0fec29017f2dbdc6f57e372f8a7efd Author: Bram Moolenaar Date: Fri Jul 24 18:47:22 2020 +0200 patch 8.2.1288: Vim9: cannot use mark in range Problem: Vim9: cannot use mark in range. Solution: Use the flag that a colon was seen. (closes https://github.com/vim/vim/issues/6528) diff --git a/src/ex_docmd.c b/src/ex_docmd.c --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1773,7 +1773,7 @@ do_one_cmd( */ cmd = ea.cmd; #ifdef FEAT_EVAL - starts_with_quote = vim9script && *ea.cmd == '\''; + starts_with_quote = vim9script && !starts_with_colon && *ea.cmd == '\''; if (!starts_with_quote) #endif ea.cmd = skip_range(ea.cmd, NULL); diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -405,6 +405,7 @@ def Test_vim9script_call() ("some")->MyFunc() assert_equal('some', var) + # line starting with single quote is not a mark 'asdfasdf'->MyFunc() assert_equal('asdfasdf', var) @@ -414,6 +415,14 @@ def Test_vim9script_call() UseString() assert_equal('xyork', var) + # prepending a colon makes it a mark + new + setline(1, ['aaa', 'bbb', 'ccc']) + normal! 3Gmt1G + :'t + assert_equal(3, getcurpos()[1]) + bwipe! + MyFunc( 'continued' ) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1288, +/**/ 1287, /**/ 1286,