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 db7e4e859ae32324ff534551a7126e9372fcd17d..0954f0eda38f55da77d255ab7be4c288e7ebee05 100644 (file)
--- 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 @@ To make these commands use a vertical split, prepend |:vertical|.  Examples: >
 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 1dfe13129f12830f500d8eeba9f19e745b07bf32..e55922060466b39845807b9d3aa183681f2f7a45 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -2296,7 +2296,7 @@ struct file_buffer
 /*
  * 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 b3237715dd6be5b6c76d8e5ec713226007fe308c..3c6d155d695ec34f66e3b468dd4dca4527e6c9a6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2251,
 /**/
     2250,
 /**/