summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-09-09 21:42:36 +0200
committerBram Moolenaar <Bram@vim.org>2016-09-09 21:42:36 +0200
commit46643713dc6bb04b4e84986b1763ef309e960161 (patch)
tree692b81c01a95e84dface3bea292b6b4e5620cb0a /src
parentea683da58cf9ecf3afab9d650d3d2da76e5298d3 (diff)
patch 7.4.2357v7.4.2357
Problem: Attempt to read history entry while not initialized. Solution: Skip when the index is negative.
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 4ff9ae17a2..25a12bed3d 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5762,7 +5762,7 @@ add_to_history(
*/
if (histype == HIST_SEARCH && in_map)
{
- if (maptick == last_maptick)
+ if (maptick == last_maptick && hisidx[HIST_SEARCH] >= 0)
{
/* Current line is from the same mapping, remove it */
hisptr = &history[HIST_SEARCH][hisidx[HIST_SEARCH]];
diff --git a/src/version.c b/src/version.c
index baba587cb1..de3d5fc970 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2357,
+/**/
2356,
/**/
2355,