# HG changeset patch # User Christian Brabandt # Date 1459617304 -7200 # Node ID 50d9fb580ffe4f8d3cebde7bdf8d74dd47302da0 # Parent 90ecdec2a99be7f19a8ef1b0a0434fccaddbae44 commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816 Author: Bram Moolenaar Date: Sat Apr 2 19:01:58 2016 +0200 patch 7.4.1695 Problem: ":syn reset" clears the effect ":syn iskeyword". (James McCoy) Solution: Remove clearing the syntax keywords. diff --git a/src/syntax.c b/src/syntax.c --- a/src/syntax.c +++ b/src/syntax.c @@ -3815,6 +3815,7 @@ 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 UNUSED) @@ -3822,7 +3823,6 @@ 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((char_u *)"runtime! syntax/syncolor.vim"); do_unlet((char_u *)"g:syntax_cmd", TRUE); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1695, +/**/ 1694, /**/ 1693,