Skip to content

Commit 015efc3

Browse files
committed
patch 7.4.2251
Problem: In rare cases diffing 4 buffers is not enough. Solution: Raise the limit to 8. (closes #1000)
1 parent 5b30291 commit 015efc3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

runtime/doc/diff.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
*diff.txt* For Vim version 7.4. Last change: 2015 Nov 01
1+
*diff.txt* For Vim version 7.4. Last change: 2016 Aug 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
55

66

77
*diff* *vimdiff* *gvimdiff* *diff-mode*
8-
This file describes the |+diff| feature: Showing differences between two,
9-
three or four versions of the same file.
8+
This file describes the |+diff| feature: Showing differences between two to
9+
eight versions of the same file.
1010

1111
The basics are explained in section |08.7| of the user manual.
1212

@@ -117,7 +117,7 @@ To make these commands use a vertical split, prepend |:vertical|. Examples: >
117117
If you always prefer a vertical split include "vertical" in 'diffopt'.
118118

119119
*E96*
120-
There can be up to four buffers with 'diff' set.
120+
There can be up to eight buffers with 'diff' set.
121121

122122
Since the option values are remembered with the buffer, you can edit another
123123
file for a moment and come back to the same file and be in diff mode again.

src/structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2296,7 +2296,7 @@ struct file_buffer
22962296
/*
22972297
* Stuff for diff mode.
22982298
*/
2299-
# define DB_COUNT 4 /* up to four buffers can be diff'ed */
2299+
# define DB_COUNT 8 /* up to eight buffers can be diff'ed */
23002300

23012301
/*
23022302
* Each diffblock defines where a block of lines starts in each of the buffers

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2251,
766768
/**/
767769
2250,
768770
/**/

0 commit comments

Comments
 (0)