From 625f0a56e362976cf7ef2fa183aa912d99f13c06 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Wed, 11 Jan 2017 20:47:23 +0800 Subject: [PATCH] Fix colorscheme --- autoload/SpaceVim.vim | 62 +++++++++++++++++++++++-------------------- config/general.vim | 2 ++ doc/SpaceVim.txt | 3 +++ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index a2f94ddf2..58c10b5b6 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -88,6 +88,9 @@ let g:spacevim_colorscheme_default = 'desert' "" " Disable/Enable simple mode of SpaceVim, in this mode, only few plugins will be " installed. +" > +" let g:spacevim_simple_mode = 1 +" < let g:spacevim_simple_mode = 0 "" " The default file manager of SpaceVim. @@ -227,47 +230,48 @@ function! SpaceVim#Layer(layer) abort endfunction function! SpaceVim#end() abort - for s:group in g:spacevim_plugin_groups_exclude - let s:i = index(g:spacevim_plugin_groups, s:group) - if s:i != -1 - call remove(g:spacevim_plugin_groups, s:i) - endif - endfor - if g:spacevim_vim_help_language ==# 'cn' - call add(g:spacevim_plugin_groups, 'chinese') - endif - if g:spacevim_use_colorscheme==1 - call add(g:spacevim_plugin_groups, 'colorscheme') - endif - - if has('nvim') - let g:spacevim_autocomplete_method = 'deoplete' - elseif has('lua') - let g:spacevim_autocomplete_method = 'neocomplete' + if g:spacevim_simple_mode + let g:spacevim_plugin_groups = ['core'] else - let g:spacevim_autocomplete_method = 'neocomplcache' - endif - if g:spacevim_enable_ycm - let g:spacevim_autocomplete_method = 'ycm' - endif - if g:spacevim_enable_neocomplcache - let g:spacevim_autocomplete_method = 'neocomplcache' + for s:group in g:spacevim_plugin_groups_exclude + let s:i = index(g:spacevim_plugin_groups, s:group) + if s:i != -1 + call remove(g:spacevim_plugin_groups, s:i) + endif + endfor + if g:spacevim_vim_help_language ==# 'cn' + call add(g:spacevim_plugin_groups, 'chinese') + endif + if g:spacevim_use_colorscheme==1 + call add(g:spacevim_plugin_groups, 'colorscheme') + endif + + if has('nvim') + let g:spacevim_autocomplete_method = 'deoplete' + elseif has('lua') + let g:spacevim_autocomplete_method = 'neocomplete' + else + let g:spacevim_autocomplete_method = 'neocomplcache' + endif + if g:spacevim_enable_ycm + let g:spacevim_autocomplete_method = 'ycm' + endif + if g:spacevim_enable_neocomplcache + let g:spacevim_autocomplete_method = 'neocomplcache' + endif endif "" " generate tags for SpaceVim let help = fnamemodify(g:Config_Main_Home, ':p:h:h') . '/doc' exe 'helptags ' . help + call SpaceVim#plugins#load() endfunction function! SpaceVim#default() abort call SpaceVim#default#SetOptions() - if g:spacevim_simple_mode - call SpaceVim#default#UseSimpleMode() - else - call SpaceVim#default#SetPlugins() - endif + call SpaceVim#default#SetPlugins() call SpaceVim#default#SetMappings() endfunction diff --git a/config/general.vim b/config/general.vim index 7a39526f8..d28a176f5 100644 --- a/config/general.vim +++ b/config/general.vim @@ -11,6 +11,8 @@ if count(g:spacevim_plugin_groups, 'colorscheme') && g:spacevim_colorscheme !=# catch exec 'colorscheme '. g:spacevim_colorscheme_default endtry +else + exec 'colorscheme '. g:spacevim_colorscheme_default endif if g:spacevim_enable_cursorline == 1 set cursorline "显示当前行 diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index 74212b3f6..81a912951 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -84,6 +84,9 @@ installed.you can change it in custom config file. *g:spacevim_simple_mode* Disable/Enable simple mode of SpaceVim, in this mode, only few plugins will be installed. +> + let g:spacevim_simple_mode = 1 +< *g:spacevim_filemanager* The default file manager of SpaceVim.