aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.0333: :mkview does not restore cursor properly after "$"

Browse Source 
Problem:    :mkview does not restore cursor properly after "$". (Dominique
            Pelle)
Solution:   Position the cursor with "normal! $".
This commit is contained in:
Bram Moolenaar
2018-08-29 21:42:42 +02:00
parent a449a7c6b9
commit 92c1b69641
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ex_docmd.c
View File

@@ -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;
}
}