summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ops.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ops.c b/src/ops.c
index 417bb1621..b83394e01 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3871,9 +3871,10 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
else
{
(void)op_delete(oap);
- if (oap->motion_type == MLINE && has_format_option(FO_AUTO))
- u_save_cursor(); // cursor line wasn't saved yet
- auto_format(FALSE, TRUE);
+ // save cursor line for undo if it wasn't saved yet
+ if (oap->motion_type == MLINE && has_format_option(FO_AUTO)
+ && u_save_cursor() == OK)
+ auto_format(FALSE, TRUE);
}
break;
diff --git a/src/version.c b/src/version.c
index 0583f64b9..8e9d8103c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2029,
+/**/
2028,
/**/
2027,