changeset 8815:50d9fb580ffe v7.4.1695

commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 02 Apr 2016 19:15:04 +0200
parents 90ecdec2a99b
children a1ace9e4eda8
files src/syntax.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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,