From 458b1fc0e793a1e1adad758626857f43e9674334 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Wed, 16 Nov 2016 08:25:25 +0900 Subject: 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 --- src/nvim/buffer_defs.h | 2 +- src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim') 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, -- cgit