diff options
| author | erw7 <erw7.github@gmail.com> | 2021-02-06 13:01:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-06 13:01:37 +0900 |
| commit | 02a9663869dce4df458f68e620265ec6b471eb06 (patch) | |
| tree | 4c660916a8f202f9496355b675fcb2e62775a63f | |
| parent | 957ac9442cd71386b374a162cf22a4f5d1618fe5 (diff) | |
| parent | 6249059d4bf263df4b6621fe837fe60f3796ab86 (diff) | |
| download | rneovim-02a9663869dce4df458f68e620265ec6b471eb06.tar.gz rneovim-02a9663869dce4df458f68e620265ec6b471eb06.tar.bz2 rneovim-02a9663869dce4df458f68e620265ec6b471eb06.zip | |
Merge pull request #13701 from erw7/fix-checkhealth
Fix checkhealth problems
| -rw-r--r-- | runtime/autoload/health/nvim.vim | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim index 8b734bbb6f..0bb343e198 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) @@ -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: ' |