summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-21 16:28:50 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-21 16:28:50 +0100
commite4eda3bc7157932b0bf380fd3fdc1ba8f4438b60 (patch)
tree6174298c138395213d3b0ae47bfeeafc68e6b951 /src
parent8f08dab18df6dbf6c4b4973fd2d480e4bffb82d8 (diff)
downloadvim-e4eda3bc7157932b0bf380fd3fdc1ba8f4438b60.zip
patch 7.4.933
Problem: Crash when using longest completion match. Solution: Fix array index.
Diffstat (limited to 'src')
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 33d612bfa..0aeb4b8c8 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3704,7 +3704,7 @@ ExpandOne(xp, str, orig, options, mode)
}
else
#endif
- c0 = xp->xp_files[i][len];
+ c0 = xp->xp_files[0][len];
for (i = 1; i < xp->xp_numfiles; ++i)
{
#ifdef FEAT_MBYTE
diff --git a/src/version.c b/src/version.c
index 30efcab42..f43cad884 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 933,
+/**/
932,
/**/
931,