kevin/darkcloud-nvimconfig
1
0
Fork 0
mirror of https://github.com/prurigro/darkcloud-nvimconfig.git synced 2024-09-19 20:04:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Kevin MacMartin 2017-02-12 19:08:28 -05:00
parent b6d303b047
commit 705713597d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vim/config/keyboard.vim
View file

@ -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
View file

@ -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: