diff --git a/src/diff.c b/src/diff.c
index d42233889..a3bb9c405 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1636,7 +1636,7 @@ diff_read(
     long	off;
     int		i;
     int		notset = TRUE;	    // block "*dp" not set yet
-    diffhunk_T	*hunk;
+    diffhunk_T	*hunk = NULL;	    // init to avoid gcc warning
 
     enum {
 	DIFF_ED,
@@ -1662,10 +1662,7 @@ diff_read(
     {
 	hunk = ALLOC_ONE(diffhunk_T);
 	if (hunk == NULL)
-	{
-	    emsg(_("E98: Cannot read diff output"));
 	    return;
-	}
     }
 
     for (;;)
diff --git a/src/version.c b/src/version.c
index 70372a6e3..c7644a43d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3943,
 /**/
     3942,
 /**/