aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/screen.c5
-rw-r--r--src/nvim/version.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 50517d2829..bf6e316c06 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -486,6 +486,11 @@ void update_single_line(win_T *wp, linenr_T lnum)
int row;
int j;
+ // Don't do anything if the screen structures are (not yet) valid.
+ if (!screen_valid(true)) {
+ return;
+ }
+
if (lnum >= wp->w_topline && lnum < wp->w_botline
&& foldedCount(wp, lnum, &win_foldinfo) == 0) {
row = 0;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index be17b6775a..cfe71c5015 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -606,6 +606,7 @@ static int included_patches[] = {
1837,
1836,
1835,
+ 1834,
1833,
1832,
1831,