From 517dfdf0fcf5c9c88c83dbb77a931b8e940b7472 Mon Sep 17 00:00:00 2001 From: Maria José Solano Date: Sat, 2 Sep 2023 19:34:09 -0700 Subject: fix(shada): update marks when using delmarks! (#24978) --- src/nvim/mark.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 6480a47344..06d0295c3d 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -925,7 +925,24 @@ void ex_delmarks(exarg_T *eap) if (*eap->arg == NUL && eap->forceit) { // clear all marks - clrallmarks(curbuf); + const Timestamp timestamp = os_time(); + for (size_t i = 0; i < NMARKS; i++) { + curbuf->b_namedm[i].mark.lnum = 0; + curbuf->b_namedm[i].timestamp = timestamp; + } + curbuf->b_last_cursor.timestamp = timestamp; + CLEAR_FMARK(&curbuf->b_last_cursor); + curbuf->b_last_cursor.mark.lnum = 1; + curbuf->b_last_insert.timestamp = timestamp; + CLEAR_FMARK(&curbuf->b_last_insert); + curbuf->b_last_change.timestamp = timestamp; + CLEAR_FMARK(&curbuf->b_last_change); + curbuf->b_op_start.lnum = 0; // start/end op mark cleared + curbuf->b_op_end.lnum = 0; + for (int i = 0; i < curbuf->b_changelistlen; i++) { + clear_fmark(&curbuf->b_changelist[i]); + } + curbuf->b_changelistlen = 0; } else if (eap->forceit) { emsg(_(e_invarg)); } else if (*eap->arg == NUL) { -- cgit