CheckHealth: terminfo: remove "kbs" advice

This commit is contained in:
Justin M. Keyes
2016-12-13 19:54:06 +01:00
parent 0b244de384
commit 657369bb68

View File

@@ -123,29 +123,23 @@ function! s:check_tmux() abort
endif endif
endfunction endfunction
function! s:check_terminfo() abort function! s:check_terminal() abort
if !executable('infocmp') if !executable('infocmp')
return return
endif endif
call health#report_start('terminfo') call health#report_start('terminal')
let suggestions = [
\ "Set key_backspace to \\177 (ASCII BACKSPACE). Run these commands:\n"
\ .'infocmp $TERM | sed ''s/kbs=^[hH]/kbs=\\177/'' > $TERM.ti'
\ ."\n"
\ .'tic $TERM.ti',
\ s:suggest_faq]
let cmd = 'infocmp -L' let cmd = 'infocmp -L'
let out = system(cmd) let out = system(cmd)
let kbs_entry = matchstr(out, 'key_backspace=\S*') let kbs_entry = matchstr(out, 'key_backspace=[^,[:space:]]*')
let kdch1_entry = matchstr(out, 'key_dc=[^,[:space:]]*')
if v:shell_error if v:shell_error
call health#report_error('command failed: '.cmd."\n".out) call health#report_error('command failed: '.cmd."\n".out)
elseif !empty(matchstr(out, '\Vkey_backspace=^H'))
call health#report_error('key_backspace (kbs) entry is ^H (ASCII DELETE): '
\ .kbs_entry, suggestions)
else else
call health#report_info('key_backspace terminfo entry: ' call health#report_info('key_backspace (kbs) terminfo entry: '
\ .(empty(kbs_entry) ? '? (not found)' : kbs_entry)) \ .(empty(kbs_entry) ? '? (not found)' : kbs_entry))
call health#report_info('key_dc (kdch1) terminfo entry: '
\ .(empty(kbs_entry) ? '? (not found)' : kdch1_entry))
endif endif
endfunction endfunction
@@ -153,6 +147,6 @@ function! health#nvim#check() abort
call s:check_config() call s:check_config()
call s:check_performance() call s:check_performance()
call s:check_rplugin_manifest() call s:check_rplugin_manifest()
call s:check_terminfo() call s:check_terminal()
call s:check_tmux() call s:check_tmux()
endfunction endfunction