From 70d60e9da1db6d916421b49347ead381e914aaad Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 31 Dec 2009 13:53:33 +0000
Subject: updated for version 7.2-325

---
 src/fileio.c  | 7 +++++++
 src/version.c | 2 ++
 2 files changed, 9 insertions(+)

(limited to 'src')

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
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    325,
 /**/
     324,
 /**/
-- 
cgit v1.2.3