patch 8.2.3631: "syntax enable" does not work properly in Vim9 context

Problem:    "syntax enable" does not work properly in Vim9 context.
Solution:   Also handle Vim9 context. (closes #9161)

diff --git a/src/syntax.c b/src/syntax.c
index b3545b37b64ac88954cb3e5af39514c029679cb0..3002bc90a8bd71ca80b21320bf898e4349f8cfb8 100644 (file)
--- 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 ee381ed1d3e86f51e7a2c5d57bb0bd759b2f3315..0fa65d1b28b91059885f8fef05acac40bf3df7e7 100644 (file)
--- 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 4fb0e9eb77b4c33fa2b2682bec860cc908bec2c8..79eb94fa4144a4115ab4efdb860214f466a67d55 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3631,
 /**/
     3630,
 /**/