aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwatiko <service@mail.watiko.net>2016-02-16 22:53:32 +0900
committerwatiko <service@mail.watiko.net>2016-02-16 22:56:02 +0900
commit9036f1644fe638af6943cff7fa19ee011ba81e8d (patch)
tree70fc86d6fb27c89925d951ba1eec7c4cecff9fe5
parent4f3ea0379eb015fc7b4f93c15e3baadf1c17e7bd (diff)
downloadrneovim-9036f1644fe638af6943cff7fa19ee011ba81e8d.tar.gz
rneovim-9036f1644fe638af6943cff7fa19ee011ba81e8d.tar.bz2
rneovim-9036f1644fe638af6943cff7fa19ee011ba81e8d.zip
vim-patch:7.4.933
Problem: Crash when using longest completion match. Solution: Fix array index. https://github.com/vim/vim/commit/e4eda3bc7157932b0bf380fd3fdc1ba8f4438b60
-rw-r--r--src/nvim/ex_getln.c2
-rw-r--r--src/nvim/version.c2
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