Mercurial > vim
diff src/mark.c @ 21403:d387121083a4 v8.2.1252
patch 8.2.1252: ":marks" may show '< and '> mixed up
Commit: https://github.com/vim/vim/commit/54c3fcd852f9d986f81547429e850b3364f058d6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 19 22:09:06 2020 +0200
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 19 Jul 2020 22:15:03 +0200 |
| parents | 9064044fd4f6 |
| children | e82579016863 |
line wrap: on
line diff
--- 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); }