aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/ex_getln.c4
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 58979c0e43..8758a63bce 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -4677,8 +4677,8 @@ add_to_history (
* down, only lines that were added.
*/
if (histype == HIST_SEARCH && in_map) {
- if (maptick == last_maptick) {
- /* Current line is from the same mapping, remove it */
+ if (maptick == last_maptick && hisidx[HIST_SEARCH] >= 0) {
+ // Current line is from the same mapping, remove it
hisptr = &history[HIST_SEARCH][hisidx[HIST_SEARCH]];
hist_free_entry(hisptr);
--hisnum[histype];
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a354634218..a911e8ebc3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -84,7 +84,7 @@ static int included_patches[] = {
// 2360,
// 2359 NA
// 2358 NA
- // 2357,
+ 2357,
// 2356,
2355,
// 2354,