patch 7.4.2251
Problem: In rare cases diffing 4 buffers is not enough.
Solution: Raise the limit to 8. (closes #1000)
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index db7e4e8..0954f0e 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,12 +1,12 @@
-*diff.txt* For Vim version 7.4. Last change: 2015 Nov 01
+*diff.txt* For Vim version 7.4. Last change: 2016 Aug 24
VIM REFERENCE MANUAL by Bram Moolenaar
*diff* *vimdiff* *gvimdiff* *diff-mode*
-This file describes the |+diff| feature: Showing differences between two,
-three or four versions of the same file.
+This file describes the |+diff| feature: Showing differences between two to
+eight versions of the same file.
The basics are explained in section |08.7| of the user manual.
@@ -117,7 +117,7 @@
If you always prefer a vertical split include "vertical" in 'diffopt'.
*E96*
-There can be up to four buffers with 'diff' set.
+There can be up to eight buffers with 'diff' set.
Since the option values are remembered with the buffer, you can edit another
file for a moment and come back to the same file and be in diff mode again.
diff --git a/src/structs.h b/src/structs.h
index 1dfe131..e559220 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -2296,7 +2296,7 @@
/*
* Stuff for diff mode.
*/
-# define DB_COUNT 4 /* up to four buffers can be diff'ed */
+# define DB_COUNT 8 /* up to eight buffers can be diff'ed */
/*
* Each diffblock defines where a block of lines starts in each of the buffers
diff --git a/src/version.c b/src/version.c
index b323771..3c6d155 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2251,
+/**/
2250,
/**/
2249,