From dcbd1c7b13e98766754c4e75d3bb59021248217e Mon Sep 17 00:00:00 2001 From: prollings Date: Mon, 11 Jul 2016 07:05:06 +1000 Subject: vim-patch:7.4.1147 (#5005) Problem: Conflict for "chartab". (Kazunobu Kuriyama) Solution: Rename the global one to something less obvious. Move it into src/chartab.c. https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/version.c') diff --git a/src/nvim/version.c b/src/nvim/version.c index 53551d81cf..966e4f9b4f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -552,7 +552,7 @@ static int included_patches[] = { 1150, 1149, // 1148 NA - // 1147, + 1147, // 1146 NA // 1145 NA 1144, -- cgit