diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-15 23:44:15 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-11-15 23:45:20 -0500 |
| commit | c66ca17ca1a2f396252bc554198f9e73c7073385 (patch) | |
| tree | 5e7f492d5345c7756d74daec35e870d5af740c4c | |
| parent | aba853a156229c7df6686a6592003b5075e79e2d (diff) | |
| parent | 458b1fc0e793a1e1adad758626857f43e9674334 (diff) | |
| download | rneovim-c66ca17ca1a2f396252bc554198f9e73c7073385.tar.gz rneovim-c66ca17ca1a2f396252bc554198f9e73c7073385.tar.bz2 rneovim-c66ca17ca1a2f396252bc554198f9e73c7073385.zip | |
Merge pull request #5614 from Shougo/vim-7.4.2251
vim-patch:7.4.2251
| -rw-r--r-- | runtime/doc/diff.txt | 8 | ||||
| -rw-r--r-- | src/nvim/buffer_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 12bc655edc..6b45f8552f 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* *diff-mode* -This file describes |diff-mode|, which shows the 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. @@ -109,7 +109,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/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 2e6316c74a..4f0de1451a 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -771,7 +771,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 four buffers can be diff'ed /* * Each diffblock defines where a block of lines starts in each of the buffers diff --git a/src/nvim/version.c b/src/nvim/version.c index 7721e9dc8c..10dbf97158 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -191,7 +191,7 @@ static int included_patches[] = { // 2254 NA // 2253 NA // 2252 NA - // 2251, + 2251, // 2250, // 2249, // 2248, |