From 54c3fcd852f9d986f81547429e850b3364f058d6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 19 Jul 2020 22:09:06 +0200 Subject: patch 8.2.1252: ":marks" may show '< and '> mixed up Problem: ":marks" may show '< and '> mixed up. Solution: Show the mark position as where '< and '> would jump. --- src/mark.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/mark.c') diff --git a/src/mark.c b/src/mark.c index 948a1826e..aa9445ed0 100644 --- a/src/mark.c +++ b/src/mark.c @@ -704,6 +704,7 @@ ex_marks(exarg_T *eap) char_u *arg = eap->arg; int i; char_u *name; + pos_T *posp, *startp, *endp; if (arg != NULL && *arg == NUL) arg = NULL; @@ -731,8 +732,17 @@ ex_marks(exarg_T *eap) show_one_mark(']', arg, &curbuf->b_op_end, NULL, TRUE); show_one_mark('^', arg, &curbuf->b_last_insert, NULL, TRUE); show_one_mark('.', arg, &curbuf->b_last_change, NULL, TRUE); - show_one_mark('<', arg, &curbuf->b_visual.vi_start, NULL, TRUE); - show_one_mark('>', arg, &curbuf->b_visual.vi_end, NULL, TRUE); + + // Show the marks as where they will jump to. + startp = &curbuf->b_visual.vi_start; + endp = &curbuf->b_visual.vi_end; + if ((LT_POS(*startp, *endp) || endp->lnum == 0) && startp->lnum != 0) + posp = startp; + else + posp = endp; + show_one_mark('<', arg, posp, NULL, TRUE); + show_one_mark('>', arg, posp == startp ? endp : startp, NULL, TRUE); + show_one_mark(-1, arg, NULL, NULL, FALSE); } -- cgit v1.2.1