From 9036f1644fe638af6943cff7fa19ee011ba81e8d Mon Sep 17 00:00:00 2001 From: watiko Date: Tue, 16 Feb 2016 22:53:32 +0900 Subject: [PATCH] vim-patch:7.4.933 Problem: Crash when using longest completion match. Solution: Fix array index. https://github.com/vim/vim/commit/e4eda3bc7157932b0bf380fd3fdc1ba8f4438b60 --- src/nvim/ex_getln.c | 2 +- src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 003d3c9ef0..39bff9b2ad 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -2969,7 +2969,7 @@ ExpandOne ( mb_len = (* mb_ptr2len)(&xp->xp_files[0][len]); c0 = (* mb_ptr2char)(&xp->xp_files[0][len]); } else { - c0 = xp->xp_files[i][len]; + c0 = xp->xp_files[0][len]; } for (i = 1; i < xp->xp_numfiles; ++i) { if (has_mbyte) { diff --git a/src/nvim/version.c b/src/nvim/version.c index fd84f566fd..5fea4d60ba 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -355,7 +355,7 @@ static int included_patches[] = { // 936, // 935, // 934 NA - // 933, + 933, 932, // 931 NA // 930 NA