diff options
-rw-r--r-- | src/nvim/syntax.c | 2 | ||||
-rw-r--r-- | src/nvim/version.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 6773a94c5f..6e177fc082 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -3341,12 +3341,12 @@ static void syn_cmd_enable(exarg_T *eap, int syncing) /* * Handle ":syntax reset" command. + * It actually resets highlighting, not syntax. */ static void syn_cmd_reset(exarg_T *eap, int syncing) { eap->nextcmd = check_nextcmd(eap->arg); if (!eap->skip) { - clear_string_option(&curwin->w_s->b_syn_isk); set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset"); do_cmdline_cmd("runtime! syntax/syncolor.vim"); do_unlet((char_u *)"g:syntax_cmd", TRUE); diff --git a/src/nvim/version.c b/src/nvim/version.c index 66e0d05db7..5c3e761225 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -85,6 +85,7 @@ static int included_patches[] = { 1755, 1753, 1728, + 1695, 1654, 1652, 1643, |