diff options
| -rw-r--r-- | src/fileio.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/fileio.c b/src/fileio.c index f63bb60dc..bdc7439ce 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2981,6 +2981,13 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit, if (fname == NULL || *fname == NUL) /* safety check */ return FAIL; + if (buf->b_ml.ml_mfp == NULL) + { + /* This can happen during startup when there is a stray "w" in the + * vimrc file. */ + EMSG(_(e_emptybuf)); + return FAIL; + } /* * Disallow writing from .exrc and .vimrc in current directory for diff --git a/src/version.c b/src/version.c index ed0058d35..c31729345 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 325, +/**/ 324, /**/ 323, |