updated for version 7.2-325

diff --git a/src/fileio.c b/src/fileio.c
index f63bb60dcac07377934409ae3ddbf020dea8c0d4..bdc7439cee790cb0a317f373764ede27f1f14442 100644 (file)
--- 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 ed0058d352d361bf8c425e70c292302a7cd2d33e..c3172934507e0d26b9d8bc0c0c545bc11370224a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    325,
 /**/
     324,
 /**/