diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-24 22:34:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-24 22:34:33 +0200 |
| commit | 015efc32c1add6269099364835ddf85ff257b3c6 (patch) | |
| tree | d32524d1add71c48e94290fad6430af25dc99a16 | |
| parent | 5b30291785e6b9be1a607504c14bd03c601b59a6 (diff) | |
| download | vim-git-7.4.2251.tar.gz | |
patch 7.4.2251v7.4.2251
Problem: In rare cases diffing 4 buffers is not enough.
Solution: Raise the limit to 8. (closes #1000)
| -rw-r--r-- | runtime/doc/diff.txt | 8 | ||||
| -rw-r--r-- | src/structs.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index db7e4e859..0954f0eda 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 @@ 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 1dfe13129..e55922060 100644 --- 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 b3237715d..3c6d155d6 100644 --- 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, |