[vim] 07/139: patch 7.4.1695 Problem: ":syn reset" clears the effect ":syn iskeyword". (James McCoy) Solution: Remove clearing the syntax keywords.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 8bc189e81aa98ba4aebb03a9dc9527a210fce816
Author: Bram Moolenaar <Bram at 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.
---
 src/syntax.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/syntax.c b/src/syntax.c
index a43f4a6..31c1d0d 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 552bb6b..e7235c1 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git