summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 85d8e6883..9c9f85650 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3367,7 +3367,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
* was in this window (or another window). If not used
* before, reset the local window options to the global
* values. Also restores old folding stuff. */
- get_winopts(buf);
+ get_winopts(curbuf);
#ifdef FEAT_SPELL
did_get_winopts = TRUE;
#endif
@@ -3649,8 +3649,8 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
#ifdef FEAT_SPELL
/* If the window options were changed may need to set the spell language.
* Can only do this after the buffer has been properly setup. */
- if (did_get_winopts && curwin->w_p_spell && *buf->b_p_spl != NUL)
- did_set_spelllang(buf);
+ if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
+ did_set_spelllang(curbuf);
#endif
if (command == NULL)
diff --git a/src/version.c b/src/version.c
index 68614db71..f11baf2b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4,
+/**/
3,
/**/
2,