updated for version 7.2-239

src/diff.c

@@ -893,6 +893,7 @@ ex_diffpatch(eap)
     char_u	*browseFile = NULL;
     int		browse_flag = cmdmod.browse;
 #endif
+    struct stat st;
 
 #ifdef FEAT_BROWSE
     if (cmdmod.browse)
@@ -999,6 +1000,11 @@ ex_diffpatch(eap)
     STRCAT(buf, ".rej");
     mch_remove(buf);
 
+    /* Only continue if the output file was created. */
+    if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
+	EMSG(_("E816: Cannot read patch output"));
+    else
+    {
 	if (curbuf->b_fname != NULL)
 	{
 	    newname = vim_strnsave(curbuf->b_fname,
@@ -1020,7 +1026,8 @@ ex_diffpatch(eap)
 	    eap->arg = tmp_new;
 	    do_exedit(eap, old_curwin);
 
-	if (curwin != old_curwin)		/* split must have worked */
+	    /* check that split worked and editing tmp_new */
+	    if (curwin != old_curwin && win_valid(old_curwin))
 	    {
 		/* Set 'diff', 'scrollbind' on and 'wrap' off. */
 		diff_win_options(curwin, TRUE);
@@ -1040,6 +1047,7 @@ ex_diffpatch(eap)
 		}
 	    }
 	}
+    }
 
 theend:
     if (tmp_orig != NULL)

src/version.c

@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    239,
 /**/
     238,
 /**/