Merge branch 'staging2' into staging

1 files changed, 17 insertions, 14 deletions

diff --git a/init.vim b/init.vim
index 402f7a6..40894af 100644
--- a/init.vim
+++ b/init.vim
@@ -1,5 +1,4 @@
 exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
-
 set packpath+=pack/neovim
 
 "=======================================================================================================================
@@ -41,22 +40,26 @@ augroup DEOPLETE
                 \     },
                 \ }
 
-    packadd deoplete.nvim
-    packadd LanguageClient-neovim
-    packadd echodoc.vim
+    " packadd deoplete.nvim
+    " packadd LanguageClient-neovim
+    " packadd echodoc.vim
 
     let g:deoplete#sources#clang#include_default_arguments=1
     " suggestions in alphabetic order
-    call deoplete#custom#source('_', 'sorters', ['sorter_word'])
-    call deoplete#custom#filter('converter_reorder_attr',
-                               \  'attrs_order', {
-                               \    '_': {
-                               \      'kind': [
-                               \        'Function',
-                               \        'Property'
-                               \      ]
-                               \   },
-                               \})   
+
+    function! ConfigureDeoplete()
+        call deoplete#custom#source('_', 'sorters', ['sorter_word'])
+        call deoplete#custom#filter('converter_reorder_attr',
+                                   \  'attrs_order', {
+                                   \    '_': {
+                                   \      'kind': [
+                                   \        'Function',
+                                   \        'Property'
+                                   \      ]
+                                   \   },
+                                   \})   
+    endfunction
+    autocmd VimEnter * call ConfigureDeoplete() 
 augroup END
 
 "=======================================================================================================================