From 55c8310dad82b884699e134dd70be4a2c3ca8f0d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 7 Dec 2018 09:00:52 +0100 Subject: [PATCH] Only load deoplete when YCM is not loaded --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 374774e..31da05d 100644 --- a/.vimrc +++ b/.vimrc @@ -275,6 +275,7 @@ let g:ycm_server_python_interpreter = '/usr/bin/python3' "let g:ycm_server_log_level = 'debug' endif +if filereadable(skip_ycm) " Only load if YouCompleteMe is not loaded if has('nvim') Plugin 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } else @@ -290,6 +291,7 @@ Plugin 'zchee/deoplete-jedi' Plugin 'Shougo/neco-syntax' let g:deoplete#enable_at_startup = 1 +endif " Improved Django handling