# HG changeset patch # User Bram Moolenaar # Date 1609871404 -3600 # Node ID 0ef920a033808f017b2ed69647b804bd690b9dd8 # Parent 9c0c0d1a38f67a8ac04b8146815cf23cd60b410f patch 8.2.2303: Vim9: backtick expansion doesn't work for :foldopen Commit: https://github.com/vim/vim/commit/ecac591cce23919059a5d93ed2e94541b1be99b5 Author: Bram Moolenaar Date: Tue Jan 5 19:23:28 2021 +0100 patch 8.2.2303: Vim9: backtick expansion doesn't work for :foldopen Problem: Vim9: backtick expansion doesn't work for :foldopen. Solution: Do recognize backtick expansion. (closes https://github.com/vim/vim/issues/7621) diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -81,6 +81,23 @@ def Test_global_backtick_expansion() bwipe! enddef +def Test_folddo_backtick_expansion() + new + var name = 'xxx' + folddoopen edit `=name` + assert_equal('xxx', bufname()) + bwipe! + + new + setline(1, ['one', 'two']) + set nomodified + :1,2fold + foldclose + folddoclose edit `=name` + assert_equal('xxx', bufname()) + bwipe! +enddef + def Test_hardcopy_wildcards() CheckUnix CheckFeature postscript diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 2303, +/**/ 2302, /**/ 2301, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -7505,6 +7505,13 @@ compile_exec(char_u *line, exarg_T *eap, } } + if (eap->cmdidx == CMD_folddoopen || eap->cmdidx == CMD_folddoclosed) + { + // TODO: should only expand when appropriate for the command + eap->arg = skiptowhite(eap->arg); + has_expr = TRUE; + } + if (has_expr && (p = (char_u *)strstr((char *)eap->arg, "`=")) != NULL) { int count = 0;