vim: src/option.c comparison

updated for version 7.0070

comparison

equal deleted inserted replaced

-:51a4d1c2a95b
+:f93df7322443
 else if (varp == &p_cb)
 	errmsg = check_clipboard_option();
 #endif
 #ifdef FEAT_SYN_HL
-/* When 'spelllang' is set, load the wordlists. */
+/* When 'spelllang' is set and there is a window for this buffer in which
+* 'spell' is set load the wordlists. */
 else if (varp == &(curbuf->b_p_spl))
 {
-	errmsg = did_set_spelllang(curbuf);
+	win_T	    *wp;
+	FOR_ALL_WINDOWS(wp)
+	    if (wp->w_buffer == curbuf && wp->w_p_spell)
+	    {
+		errmsg = did_set_spelllang(curbuf);
+# ifdef FEAT_WINDOWS
+		break;
+# endif
+	    }
 }
 #endif
 #ifdef FEAT_AUTOCMD
 # ifdef FEAT_SYN_HL
 	if (p_imdisable)
 	    im_set_active(FALSE);
 }
 #endif
+#ifdef FEAT_SYN_HL
+/* 'spell' */
+else if ((int *)varp == &curwin->w_p_spell)
+{
+	if (curwin->w_p_spell)
+	{
+	    char_u	*errmsg = did_set_spelllang(curbuf);
+	    if (errmsg != NULL)
+		EMSG(_(errmsg));
+	}
+}
+#endif
 #ifdef FEAT_FKMAP
 else if ((int *)varp == &p_altkeymap)
 {
 	if (old_value != p_altkeymap)
 	{
 #endif
 #ifdef FEAT_SYN_HL
 	    /* Don't copy 'syntax', it must be set */
 	    buf->b_p_syn = empty_option;
 	    buf->b_p_spl = vim_strsave(p_spl);
-	    did_set_spelllang(buf);
 #endif
 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
 	    buf->b_p_inde = vim_strsave(p_inde);
 	    buf->b_p_indk = vim_strsave(p_indk);
 #endif

Mercurial > vim