summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-08-25 11:58:36 +0200
committerBram Moolenaar <Bram@vim.org>2015-08-25 11:58:36 +0200
commit670acbc70f371409b46b722bd9a1166e53574f42 (patch)
treed106c8db7b66d42bee2ed17b1d643fbdf2b75927 /src
parent8cba8ba3e026c12a5294a1260dbfea9c0d8fe7eb (diff)
downloadvim-git-670acbc70f371409b46b722bd9a1166e53574f42.tar.gz
patch 7.4.828v7.4.828
Problem: Crash when using "syn keyword x c". (Dominique Pelle) Solution: Initialize the keyword tabble. (Raymond Ko, PR 397)
Diffstat (limited to 'src')
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c
index c28a24c5c..a16715a95 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6314,6 +6314,8 @@ ex_ownsyntax(eap)
{
curwin->w_s = (synblock_T *)alloc(sizeof(synblock_T));
memset(curwin->w_s, 0, sizeof(synblock_T));
+ hash_init(&curwin->w_s->b_keywtab);
+ hash_init(&curwin->w_s->b_keywtab_ic);
#ifdef FEAT_SPELL
/* TODO: keep the spell checking as it was. */
curwin->w_p_spell = FALSE; /* No spell checking */
diff --git a/src/version.c b/src/version.c
index e4466041a..dd3449054 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 828,
+/**/
827,
/**/
826,