From 5fbd92c60709deb6f063bef22a6abb413f176e23 Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Mon, 9 Apr 2018 20:07:27 +0800 Subject: [PATCH] Use deoplete only for vim8 (#1604) * Use deoplete only for vim8 * Use deoplete only for vim8 * Fix gui fonts * Fix 74 * Fix up * Fix issue --- autoload/SpaceVim.vim | 3 ++- autoload/SpaceVim/api/vim/compatible.vim | 1 + autoload/SpaceVim/issue.vim | 6 +++--- autoload/SpaceVim/options.vim | 16 +++------------- config/general.vim | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 9641d8d17..a19f7dbed 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -104,7 +104,8 @@ let g:spacevim_realtime_leader_guide = 1 " let g:spacevim_enable_key_frequency = 1 " < let g:spacevim_enable_key_frequency = 0 -if has('python3') && SpaceVim#util#haspy3lib('neovim') +if (has('python3') && SpaceVim#util#haspy3lib('neovim')) && + \ (has('nvim') || (has('patch-8.0.0027'))) "" " Set the autocomplete engine of spacevim, the default logic is: " > diff --git a/autoload/SpaceVim/api/vim/compatible.vim b/autoload/SpaceVim/api/vim/compatible.vim index 3042aada6..03797eb57 100644 --- a/autoload/SpaceVim/api/vim/compatible.vim +++ b/autoload/SpaceVim/api/vim/compatible.vim @@ -30,6 +30,7 @@ else else let s = a:1 endif + let output = '' redir => output if s ==# 'silent' silent execute a:cmd diff --git a/autoload/SpaceVim/issue.vim b/autoload/SpaceVim/issue.vim index 115f24439..5217cd0c4 100644 --- a/autoload/SpaceVim/issue.vim +++ b/autoload/SpaceVim/issue.vim @@ -13,12 +13,12 @@ function! SpaceVim#issue#report() abort endfunction function! s:open() abort - exe 'tabnew ' . tempname() . '/issue_report.md' + exe 'silent tabnew ' . tempname() . '/issue_report.md' let b:spacevim_issue_template = 1 let template = s:template() call setline(1, template) let @+ = join(template, "\n") - w + silent w endfunction function! s:spacevim_status() abort @@ -52,7 +52,7 @@ function! s:template() abort \ '', \ '## Output of the `:SPDebugInfo!`', \ ''] - \ + split(SpaceVim#api#import('vim#compatible').execute(':SPDebugInfo'), "\n") + + \ + split(s:CMP.execute(':SPDebugInfo'), "\n") + \ [ \ '## Screenshots', \ '', diff --git a/autoload/SpaceVim/options.vim b/autoload/SpaceVim/options.vim index 484c389a8..61d0f9c2a 100644 --- a/autoload/SpaceVim/options.vim +++ b/autoload/SpaceVim/options.vim @@ -5,16 +5,17 @@ " URL: https://spacevim.org " License: GPLv3 "============================================================================= +let s:CPT = SpaceVim#api#import('vim#compatible') function! SpaceVim#options#list() abort let list = [] - if has('patch-7.4.2010') && 0 + if has('patch-7.4.2010') for var in getcompletion('g:spacevim_','var') call add(list, var . ' = ' . string(get(g:, var[2:] , ''))) endfor else redraw - for var in filter(map(s:execute('let g:'), "matchstr(v:val, '\\S\\+')"), "v:val =~# '^spacevim_'") + for var in filter(map(split(s:CPT.execute('let g:'), "\n"), "matchstr(v:val, '\\S\\+')"), "v:val =~# '^spacevim_'") call add(list,'g:' . var . ' = ' . string(get(g:, var , ''))) endfor endif @@ -33,15 +34,4 @@ function! SpaceVim#options#set(argv, ...) abort endif endfunction -function! s:execute(cmd) abort - if exists('*execute') - return split(execute(a:cmd), "\n") - endif - - redir => output - execute a:cmd - redir END - return split(output, "\n") -endfunction - " vim:set et sw=2: diff --git a/config/general.vim b/config/general.vim index 95601d7ea..a9240bf0b 100644 --- a/config/general.vim +++ b/config/general.vim @@ -29,5 +29,5 @@ if g:spacevim_hiddenfileinfo == 1 && has('patch-7.4.1570') set shortmess+=F endif if !empty(g:spacevim_guifont) - exe 'set guifont=' . g:spacevim_guifont + let &guifont = g:spacevim_guifont endif