diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-12-31 13:53:33 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-12-31 13:53:33 +0000 |
| commit | 70d60e9da1db6d916421b49347ead381e914aaad (patch) | |
| tree | 950cb57596b8e76e1e5ee3657de5587cad7ab0f9 /src | |
| parent | 742d1ecd17422afaad75acc016392073c25ef4f6 (diff) | |
updated for version 7.2-325v7.2.325
Diffstat (limited to 'src')
| -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 f63bb60dca..bdc7439cee 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 ed0058d352..c317293450 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, |