diff options
| -rw-r--r-- | src/diff.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/diff.c b/src/diff.c index d42233889c..a3bb9c405f 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 70372a6e34..c7644a43d9 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3943, +/**/ 3942, /**/ 3941, |