aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.4.524

Browse Source 
Problem:    When using ":ownsyntax" spell checking is messed up. (Issue 78)
Solution:   Use the window-local option values. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2014-11-19 19:33:16 +01:00
parent 2f3b510b0f
commit 2683c8e7f7
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/option.c
View File

@@ -6706,15 +6706,16 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
#ifdef FEAT_SPELL #ifdef FEAT_SPELL
/* When 'spelllang' or 'spellfile' is set and there is a window for this /* When 'spelllang' or 'spellfile' is set and there is a window for this
* buffer in which 'spell' is set load the wordlists. */ * 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; win_T *wp;
int l; 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); l = (int)STRLEN(curwin->w_s->b_p_spf);
if (l > 0 && (l < 4 || STRCMP(curbuf->b_s.b_p_spf + l - 4, if (l > 0 && (l < 4 || STRCMP(curwin->w_s->b_p_spf + l - 4,
".add") != 0)) ".add") != 0))
errmsg = e_invarg; errmsg = e_invarg;
} }

3
src/syntax.c
View File

@@ -6304,11 +6304,10 @@ ex_ownsyntax(eap)
curwin->w_s = (synblock_T *)alloc(sizeof(synblock_T)); curwin->w_s = (synblock_T *)alloc(sizeof(synblock_T));
memset(curwin->w_s, 0, sizeof(synblock_T)); memset(curwin->w_s, 0, sizeof(synblock_T));
#ifdef FEAT_SPELL #ifdef FEAT_SPELL
/* TODO: keep the spell checking as it was. */
curwin->w_p_spell = FALSE; /* No spell checking */ 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_spc);
clear_string_option(&curwin->w_s->b_p_spf); 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); clear_string_option(&curwin->w_s->b_p_spl);
#endif #endif
} }

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
524,
/**/ /**/
523, 523,
/**/ /**/