summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-07-17 17:35:13 +0200
committerBram Moolenaar <bram@vim.org>2013-07-17 17:35:13 +0200
commit7d41eb8cd9f80d981dab6371c06a6216c9453053 (patch)
tree493e5b31ff9d50e536040a414c7ce1bc73e0cd0e
parent5d9f6d53aef944ac5b2f3cb83cb0c90747576549 (diff)
downloadvim-7.4a.028.tar.gz
updated for version 7.4a.028v7.4a.028v7-4a-028
Problem: Crash when spell checking in new buffer. Solution: Set the b_p_key field. (Mike Williams)
-rw-r--r--src/spell.c3
-rw-r--r--src/testdir/test58.in4
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/src/spell.c b/src/spell.c
index e558a99e..20344f25 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -9054,6 +9054,9 @@ open_spellbuf()
{
buf->b_spell = TRUE;
buf->b_p_swf = TRUE; /* may create a swap file */
+#ifdef FEAT_CRYPT
+ buf->b_p_key = empty_option;
+#endif
ml_open(buf);
ml_open_file(buf); /* create swap file now */
}
diff --git a/src/testdir/test58.in b/src/testdir/test58.in
index 9600e83f..cef1cfa1 100644
--- a/src/testdir/test58.in
+++ b/src/testdir/test58.in
@@ -7,6 +7,10 @@ STARTTEST
:set enc=latin1
:e!
:"
+:" Check using z= in new buffer (crash fixed by patch 7.4a.028).
+:set maxmem=512 spell
+iasdz=:"
+:"
:" Function to test .aff/.dic with list of good and bad words.
:func TestOne(aff, dic)
set spellfile=
diff --git a/src/version.c b/src/version.c
index 64325c2a..f0dd3711 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 28,
+/**/
27,
/**/
26,