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
index a43f4a63a0da80aac0c5aa98bb72623425e3bbc6..31c1d0d533cfd7ffa8afc572df54e3b29d991335 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3815,6 +3815,7 @@ syn_cmd_enable(exarg_T *eap, int syncing UNUSED)
 
 /*
  * 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 UNUSED)
     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
index 552bb6bc13218ef8854da79d4c72a0da38137771..e7235c15855d3304c051651e2e6af53c8e5ea85a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1695,
 /**/
     1694,
 /**/