diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-11-16 08:25:25 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-11-16 08:55:17 +0900 |
| commit | 458b1fc0e793a1e1adad758626857f43e9674334 (patch) | |
| tree | 54b2808d06f953fb6f862e1433626450a1255e4e | |
| parent | c91e9c1c7af48ad55a19a77b34fcabe6029fd956 (diff) | |
| download | rneovim-458b1fc0e793a1e1adad758626857f43e9674334.tar.gz rneovim-458b1fc0e793a1e1adad758626857f43e9674334.tar.bz2 rneovim-458b1fc0e793a1e1adad758626857f43e9674334.zip | |
vim-patch:7.4.2251
Problem: In rare cases diffing 4 buffers is not enough.
Solution: Raise the limit to 8. (closes vim/vim#1000)
https://github.com/vim/vim/commit/015efc32c1add6269099364835ddf85ff257b3c6
| -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..43b2d42fbe 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 08eff53d1e..b08aecf748 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, |