summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/edit.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/edit.c b/src/edit.c
index 84b6eef4b6..c23b0a8556 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2438,12 +2438,12 @@ stop_insert(
* otherwise CTRL-O w and then <Left> will clear "last_insert".
*/
ptr = get_inserted();
- if (did_restart_edit == 0 || (ptr != NULL
- && (int)STRLEN(ptr) > new_insert_skip))
+ int added = ptr == NULL ? 0 : (int)STRLEN(ptr) - new_insert_skip;
+ if (did_restart_edit == 0 || added > 0)
{
vim_free(last_insert);
last_insert = ptr;
- last_insert_skip = new_insert_skip;
+ last_insert_skip = added < 0 ? 0 : new_insert_skip;
}
else
vim_free(ptr);
diff --git a/src/version.c b/src/version.c
index f25f59fc84..23e69b3433 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1429,
+/**/
1428,
/**/
1427,