summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/syntax.c b/src/syntax.c
index a43f4a63a..31c1d0d53 100644
--- 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 552bb6bc1..e7235c158 100644
--- 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,