From b77e21b35c07cbe6b5a9c5fa11255bc61be05a41 Mon Sep 17 00:00:00 2001 From: erw7 Date: Wed, 6 Jan 2021 12:14:57 +0900 Subject: [PATCH 1/2] checkhealth: fix problem where &shada is empty fixes #13700 --- runtime/autoload/health/nvim.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim index 8b734bbb6f..97da3b1e7e 100644 --- a/runtime/autoload/health/nvim.vim +++ b/runtime/autoload/health/nvim.vim @@ -42,7 +42,7 @@ function! s:check_config() abort endif let writeable = v:true - let shadafile = substitute(matchstr( + let shadafile = empty(&shada) ? &shada : substitute(matchstr( \ split(&shada, ',')[-1], '^n.\+'), '^n', '', '') let shadafile = empty(&shadafile) ? empty(shadafile) ? \ stdpath('data').'/shada/main.shada' : expand(shadafile) From 6249059d4bf263df4b6621fe837fe60f3796ab86 Mon Sep 17 00:00:00 2001 From: erw7 Date: Wed, 6 Jan 2021 12:39:00 +0900 Subject: [PATCH 2/2] checkhealth: fix terminfo problems on Windows fixes #13415 --- runtime/autoload/health/nvim.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim index 97da3b1e7e..0bb343e198 100644 --- a/runtime/autoload/health/nvim.vim +++ b/runtime/autoload/health/nvim.vim @@ -247,6 +247,10 @@ function! s:check_terminal() abort let kdch1_entry = matchstr(out, 'key_dc=[^,[:space:]]*') if v:shell_error + \ && (!has('win32') + \ || empty(matchstr(out, + \ 'infocmp: couldn''t open terminfo file .\+' + \ ..'\%(conemu\|vtpcon\|win32con\)'))) call health#report_error('command failed: '.cmd."\n".out) else call health#report_info('key_backspace (kbs) terminfo entry: '