From 29e618c93c85f2c7c6e386f90a234b18b65f8d44 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 2 Jun 2016 10:29:05 -0400 Subject: [PATCH] vim-patch:7.4.1695 Problem: ":syn reset" clears the effect ":syn iskeyword". (James McCoy) Solution: Remove clearing the syntax keywords. https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816 --- src/nvim/syntax.c | 2 +- src/nvim/version.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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,