aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/autoload/man.vim2
-rw-r--r--src/nvim/screen.c5
-rw-r--r--src/nvim/version.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim
index dbb46914a2..6fed4a54e3 100644
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -106,7 +106,7 @@ function! s:system(cmd, ...) abort
throw printf('command interrupted: %s', join(a:cmd))
endif
if opts.exit_code != 0
- throw printf("command error (%d) %s: %s", jobid, join(a:cmd), opts.stderr)
+ throw printf("command error (%d) %s: %s", jobid, join(a:cmd), substitute(opts.stderr, '\_s\+$', '', &gdefault ? '' : 'g'))
endif
return opts.stdout
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 8497d213e7..9f3395680b 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,