Mercurial > vim
changeset 23521:0ef920a03380 v8.2.2303
patch 8.2.2303: Vim9: backtick expansion doesn't work for :foldopen
Commit: https://github.com/vim/vim/commit/ecac591cce23919059a5d93ed2e94541b1be99b5
Author: Bram Moolenaar <Bram@vim.org>
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 05 Jan 2021 19:30:04 +0100 |
| parents | 9c0c0d1a38f6 |
| children | 32ad1f147776 |
| files | src/testdir/test_vim9_cmd.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 26 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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,
--- 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;