diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-02 19:01:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-02 19:01:58 +0200 |
| commit | 8bc189e81aa98ba4aebb03a9dc9527a210fce816 (patch) | |
| tree | f578646ed9529663193c94a56af404bd94ebc2b8 | |
| parent | f28d87146544e3b5d70aaa6a2513019f6de043ad (diff) | |
| download | vim-git-7.4.1695.tar.gz | |
patch 7.4.1695v7.4.1695
Problem: ":syn reset" clears the effect ":syn iskeyword". (James McCoy)
Solution: Remove clearing the syntax keywords.
| -rw-r--r-- | src/syntax.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |