changeset 9955:f52b263fb3f0 v7.4.2251

commit https://github.com/vim/vim/commit/015efc32c1add6269099364835ddf85ff257b3c6 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 24 22:34:33 2016 +0200 patch 7.4.2251 Problem: In rare cases diffing 4 buffers is not enough. Solution: Raise the limit to 8. (closes https://github.com/vim/vim/issues/1000)
author Christian Brabandt <cb@256bit.org>
date Wed, 24 Aug 2016 22:45:06 +0200
parents 500c11e614a5
children 058fa617bb4b
files runtime/doc/diff.txt src/structs.h src/version.c
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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 sp
 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.
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2251,
+/**/
     2250,
 /**/
     2249,