thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.2251

Browse Source 
Problem:    In rare cases diffing 4 buffers is not enough.
Solution:   Raise the limit to 8. (closes #1000)
This commit is contained in:
Bram Moolenaar
2016-08-24 22:34:33 +02:00
parent 5b30291785
commit 015efc32c1
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/doc/diff.txt
View File

@@ -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 VIM REFERENCE MANUAL by Bram Moolenaar
*diff* *vimdiff* *gvimdiff* *diff-mode* *diff* *vimdiff* *gvimdiff* *diff-mode*
This file describes the |+diff| feature: Showing differences between two, This file describes the |+diff| feature: Showing differences between two to
three or four versions of the same file. eight versions of the same file.
The basics are explained in section |08.7| of the user manual. 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'. If you always prefer a vertical split include "vertical" in 'diffopt'.
*E96* *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 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. file for a moment and come back to the same file and be in diff mode again.

2
src/structs.h
View File

@@ -2296,7 +2296,7 @@ struct file_buffer
/* /*
* Stuff for diff mode. * 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 * Each diffblock defines where a block of lines starts in each of the buffers

2
src/version.c
View File

@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2251,
/**/ /**/
2250, 2250,
/**/ /**/