mirror of
https://github.com/prurigro/darkcloud-nvimconfig.git
synced 2024-11-22 11:44:10 -05:00
Don't add neocomplete.vim to pathogen_disabled twice if neovim is being used as well as having lua support disabled, and don't include neocomplete keyboard settings if it's disabled because of missing lua support
This commit is contained in:
parent
b6d303b047
commit
705713597d
2 changed files with 6 additions and 4 deletions
|
@ -700,7 +700,7 @@
|
||||||
"}
|
"}
|
||||||
|
|
||||||
"AUTOCOMPLETION:{
|
"AUTOCOMPLETION:{
|
||||||
if !has('nvim')
|
if !has('nvim') && has('lua')
|
||||||
"neocomplete close popup and save indent
|
"neocomplete close popup and save indent
|
||||||
inoremap <silent> <CR> <C-r>=<SID>neocache_cr()<CR>
|
inoremap <silent> <CR> <C-r>=<SID>neocache_cr()<CR>
|
||||||
function! s:neocache_cr()
|
function! s:neocache_cr()
|
||||||
|
|
8
vimrc
8
vimrc
|
@ -41,14 +41,16 @@
|
||||||
" disable incompatible plugins
|
" disable incompatible plugins
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
call add(pathogen_disabled, 'vim-fixkey')
|
call add(pathogen_disabled, 'vim-fixkey')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if has('nvim') || !has('lua')
|
||||||
call add(pathogen_disabled, 'neocomplete.vim')
|
call add(pathogen_disabled, 'neocomplete.vim')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if !has('python')
|
if !has('python')
|
||||||
call add(pathogen_disabled, 'MatchTagAlways')
|
call add(pathogen_disabled, 'MatchTagAlways')
|
||||||
endif
|
endif
|
||||||
if !has('lua')
|
|
||||||
call add(pathogen_disabled, 'neocomplete.vim')
|
|
||||||
endif
|
|
||||||
runtime bundle/vim-pathogen/autoload/pathogen.vim
|
runtime bundle/vim-pathogen/autoload/pathogen.vim
|
||||||
|
|
||||||
"Load Keymappings:
|
"Load Keymappings:
|
||||||
|
|
Loading…
Reference in a new issue