diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim index 89fe4de39..0aeac7a80 100644 --- a/autoload/SpaceVim/layers/tools.vim +++ b/autoload/SpaceVim/layers/tools.vim @@ -16,7 +16,7 @@ function! SpaceVim#layers#tools#plugins() abort let plugins = [] call add(plugins, ['tpope/vim-scriptease', { 'merged' : 0}]) call add(plugins, ['lymslive/vimloo', { 'merged' : 0}]) - call add(plugins, ['lymslive/vnote', { 'depends' : 'vimloo', 'on_cmd' : ['NoteBook','NoteNew','NoteEdit', 'NoteList', 'NoteConfig', 'NoteIndex', 'NoteImport']}]) + call add(plugins, ['lymslive/vnote', { 'merged' : 0}]) call add(plugins, ['junegunn/rainbow_parentheses.vim', { 'merged' : 0}]) call add(plugins, ['mbbill/fencview', { 'on_cmd' : 'FencAutoDetect'}]) call add(plugins, ['wsdjeg/vim-cheat', { 'on_cmd' : 'Cheat'}]) diff --git a/bundle/cscope.vim/autoload/cscope.vim b/bundle/cscope.vim/autoload/cscope.vim index 7ec61a872..ae40d2986 100644 --- a/bundle/cscope.vim/autoload/cscope.vim +++ b/bundle/cscope.vim/autoload/cscope.vim @@ -49,15 +49,6 @@ function! s:echo(msg) abort echon a:msg endfunction -if !exists('g:cscope_cmd') - if executable('cscope') - let g:cscope_cmd = 'cscope' - else - call s:echo('cscope: command not found') - finish - endif -endif - let s:FILE = SpaceVim#api#import('file') let s:JSON = SpaceVim#api#import('data#json') let s:cscope_cache_dir = s:FILE.unify_path('~/.cache/SpaceVim/cscope/') diff --git a/bundle/cscope.vim/plugin/cscope.vim b/bundle/cscope.vim/plugin/cscope.vim index 99a0dac43..e3a30ce0a 100644 --- a/bundle/cscope.vim/plugin/cscope.vim +++ b/bundle/cscope.vim/plugin/cscope.vim @@ -7,25 +7,30 @@ "============================================================================= if !exists('g:cscope_silent') - "" - " Silent or not when run cscope command. by default it is 1. - let g:cscope_silent = 1 + "" + " Silent or not when run cscope command. by default it is 1. + let g:cscope_silent = 1 endif +if !exists('g:cscope_cmd') + let g:cscope_cmd = 'cscope' +endif + + if !exists('g:cscope_auto_update') - let g:cscope_auto_update = 1 + let g:cscope_auto_update = 1 endif if !exists('g:cscope_open_location') - let g:cscope_open_location = 1 + let g:cscope_open_location = 1 endif if exists('g:cscope_preload_path') - let g:cscope_preload_path = '' + let g:cscope_preload_path = '' endif if !exists('g:cscope_split_threshold') - let g:cscope_split_threshold = 10000 + let g:cscope_split_threshold = 10000 endif set cscopequickfix=s-,g-,d-,c-,t-,e-,f-,i- @@ -41,10 +46,10 @@ if exists('g:cscope_preload_path') endif if g:cscope_auto_update == 1 - augroup cscope_core - autocmd! - au BufWritePost * call cscope#onChange() - augroup END + augroup cscope_core + autocmd! + au BufWritePost * call cscope#onChange() + augroup END endif