mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #13701 from erw7/fix-checkhealth
Fix checkhealth problems
This commit is contained in:
commit
02a9663869
@ -42,7 +42,7 @@ function! s:check_config() abort
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
let writeable = v:true
|
let writeable = v:true
|
||||||
let shadafile = substitute(matchstr(
|
let shadafile = empty(&shada) ? &shada : substitute(matchstr(
|
||||||
\ split(&shada, ',')[-1], '^n.\+'), '^n', '', '')
|
\ split(&shada, ',')[-1], '^n.\+'), '^n', '', '')
|
||||||
let shadafile = empty(&shadafile) ? empty(shadafile) ?
|
let shadafile = empty(&shadafile) ? empty(shadafile) ?
|
||||||
\ stdpath('data').'/shada/main.shada' : expand(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:]]*')
|
let kdch1_entry = matchstr(out, 'key_dc=[^,[:space:]]*')
|
||||||
|
|
||||||
if v:shell_error
|
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)
|
call health#report_error('command failed: '.cmd."\n".out)
|
||||||
else
|
else
|
||||||
call health#report_info('key_backspace (kbs) terminfo entry: '
|
call health#report_info('key_backspace (kbs) terminfo entry: '
|
||||||
|
Loading…
Reference in New Issue
Block a user