diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-19 19:33:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-19 19:33:16 +0100 |
| commit | 2683c8e7f7d8eb6222653d55849a9c556de27f45 (patch) | |
| tree | 1e1104e9a4bfd19fa02bf3246eba7e657dd3231f | |
| parent | 2f3b510b0f9203d31e2f7f536ebfbcb17766e09e (diff) | |
| download | vim-git-2683c8e7f7d8eb6222653d55849a9c556de27f45.tar.gz | |
updated for version 7.4.524v7.4.524
Problem: When using ":ownsyntax" spell checking is messed up. (Issue 78)
Solution: Use the window-local option values. (Christian Brabandt)
| -rw-r--r-- | src/option.c | 9 | ||||
| -rw-r--r-- | src/syntax.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/option.c b/src/option.c index 6841d42d6..a97dae626 100644 --- 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 fcd20c8ac..4f6ef924b 100644 --- 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 cc3bb2435..890a49bf0 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 */ /**/ + 524, +/**/ 523, /**/ 522, |