updated for version 7.4.524

Problem:    When using ":ownsyntax" spell checking is messed up. (Issue 78)
Solution:   Use the window-local option values. (Christian Brabandt)

diff --git a/src/option.c b/src/option.c
index 6841d42d6cfa92afdde42778c6746b0a7d8e7cb2..a97dae6262996a1f2b15a857c8c254466523fdb0 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -6706,15 +6706,16 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 #ifdef FEAT_SPELL
     /* When 'spelllang' or 'spellfile' is set and there is a window for this
      * buffer in which 'spell' is set load the wordlists. */
-    else if (varp == &(curbuf->b_s.b_p_spl) || varp == &(curbuf->b_s.b_p_spf))
+    else if (varp == &(curwin->w_s->b_p_spl)
+           || varp == &(curwin->w_s->b_p_spf))
     {
        win_T       *wp;
        int         l;
 
-       if (varp == &(curbuf->b_s.b_p_spf))
+       if (varp == &(curwin->w_s->b_p_spf))
        {
-           l = (int)STRLEN(curbuf->b_s.b_p_spf);
-           if (l > 0 && (l < 4 || STRCMP(curbuf->b_s.b_p_spf + l - 4,
+           l = (int)STRLEN(curwin->w_s->b_p_spf);
+           if (l > 0 && (l < 4 || STRCMP(curwin->w_s->b_p_spf + l - 4,
                                                                ".add") != 0))
                errmsg = e_invarg;
        }

diff --git a/src/syntax.c b/src/syntax.c
index fcd20c8acef636c397cfbd723cd5469238dd76e5..4f6ef924b4c2fa76dd5fc4c34f27fa3c716f4fd7 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6304,11 +6304,10 @@ ex_ownsyntax(eap)
        curwin->w_s = (synblock_T *)alloc(sizeof(synblock_T));
        memset(curwin->w_s, 0, sizeof(synblock_T));
 #ifdef FEAT_SPELL
+       /* TODO: keep the spell checking as it was. */
        curwin->w_p_spell = FALSE;      /* No spell checking */
        clear_string_option(&curwin->w_s->b_p_spc);
        clear_string_option(&curwin->w_s->b_p_spf);
-       vim_regfree(curwin->w_s->b_cap_prog);
-       curwin->w_s->b_cap_prog = NULL;
        clear_string_option(&curwin->w_s->b_p_spl);
 #endif
     }

diff --git a/src/version.c b/src/version.c
index cc3bb243569c7790eb6d825813473cca864cd941..890a49bf0b2d8a57cc92b4d4c51d55b9de163138 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    524,
 /**/
     523,
 /**/