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! $".
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d4cf6a2..c8a1c3f 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -11706,6 +11706,18 @@
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 @@
(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;
}
}