Mercurial > vim
diff src/ex_docmd.c @ 14640:22248c686b32 v8.1.0333
patch 8.1.0333: :mkview does not restore cursor properly after "$"
commit https://github.com/vim/vim/commit/92c1b696413bf0e28f2fec22090d42e8a825eff2
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 29 21:42:42 2018 +0200
patch 8.1.0333: :mkview does not restore cursor properly after "$"
Problem: :mkview does not restore cursor properly after "$". (Dominique
Pelle)
Solution: Position the cursor with "normal! $".
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 29 Aug 2018 21:45:05 +0200 |
| parents | 89cc3e7ecb68 |
| children | c3222a7342ab |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -11706,6 +11706,18 @@ ses_do_win(win_T *wp) return TRUE; } + static int +put_view_curpos(FILE *fd, win_T *wp, char *spaces) +{ + int r; + + if (wp->w_curswant == MAXCOL) + r = fprintf(fd, "%snormal! $", spaces); + else + r = fprintf(fd, "%snormal! 0%d|", spaces, wp->w_virtcol + 1); + return r < 0 || put_eol(fd) == FAIL ? FALSE : OK; +} + /* * Write commands to "fd" to restore the view of a window. * Caller must make sure 'scrolloff' is zero. @@ -11897,17 +11909,12 @@ put_view( (long)wp->w_virtcol + 1) < 0 || put_eol(fd) == FAIL || put_line(fd, "else") == FAIL - || fprintf(fd, " normal! 0%d|", wp->w_virtcol + 1) < 0 - || put_eol(fd) == FAIL + || put_view_curpos(fd, wp, " ") == FAIL || put_line(fd, "endif") == FAIL) return FAIL; } - else - { - if (fprintf(fd, "normal! 0%d|", wp->w_virtcol + 1) < 0 - || put_eol(fd) == FAIL) - return FAIL; - } + else if (put_view_curpos(fd, wp, "") == FAIL) + return FAIL; } }