vim-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! $".
92c1b69641
This commit is contained in:
Jan Edmund Lazo
2018-09-02 23:01:52 -04:00
parent 5c9cd009e1
commit bd7371f460
2 changed files with 25 additions and 12 deletions

View File

@@ -9239,6 +9239,18 @@ static int ses_do_win(win_T *wp)
return true;
}
static int put_view_curpos(FILE *fd, const 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 ? FAIL : OK;
}
/*
* Write commands to "fd" to restore the view of a window.
* Caller must make sure 'scrolloff' is zero.
@@ -9405,14 +9417,11 @@ put_view(
(int64_t)(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;
}
}
}