diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-11-20 19:50:59 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-11-20 19:50:59 +0000 |
| commit | c8a9fe541d3bee36d2760ed156997ddbb0142ee1 (patch) | |
| tree | 36295bc5f609c58e7e5021dacedf134f5f1d193b | |
| parent | d85fccdfed58108c4e0958d0b17c64690b5f073f (diff) | |
| download | vim-git-c8a9fe541d3bee36d2760ed156997ddbb0142ee1.tar.gz | |
patch 8.2.3631: "syntax enable" does not work properly in Vim9 contextv8.2.3631
Problem: "syntax enable" does not work properly in Vim9 context.
Solution: Also handle Vim9 context. (closes #9161)
| -rw-r--r-- | src/syntax.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c index b3545b37b..3002bc90a 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -3777,7 +3777,7 @@ syn_cmd_on(exarg_T *eap, int syncing UNUSED) static void syn_cmd_enable(exarg_T *eap, int syncing UNUSED) { - set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable"); + set_internal_string_var((char_u *)"g:syntax_cmd", (char_u *)"enable"); syn_cmd_onoff(eap, "syntax"); do_unlet((char_u *)"g:syntax_cmd", TRUE); } @@ -3792,7 +3792,7 @@ syn_cmd_reset(exarg_T *eap, int syncing UNUSED) set_nextcmd(eap, eap->arg); if (!eap->skip) { - set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset"); + set_internal_string_var((char_u *)"g:syntax_cmd", (char_u *)"reset"); do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim"); do_unlet((char_u *)"g:syntax_cmd", TRUE); } diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index ee381ed1d..0fa65d1b2 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -1581,5 +1581,13 @@ def Test_previewpopup() set previewpopup& enddef +def Test_syntax_enable_clear() + syntax clear + syntax enable + highlight clear String + assert_equal(true, hlget('String')->get(0, {})->get('default', false)) + syntax clear +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index 4fb0e9eb7..79eb94fa4 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3631, +/**/ 3630, /**/ 3629, |