Permalink
Browse files

Revert "Auto merge of #2473 - wincent:no-lazy, r=Valloric"

This reverts commit c182c05, reversing
changes made to 48b7cce.
  • Loading branch information...
1 parent c182c05 commit caa4291a9adb02ff99a6b4600f0b1d8a294f066b @Valloric committed Dec 16, 2016
Showing with 10 additions and 14 deletions.
  1. +0 −13 README.md
  2. +10 −1 plugin/youcompleteme.vim
View
@@ -2882,19 +2882,6 @@ executable first in your PATH when the virtual environment is active then if
you set `g:ycm_python_binary_path` to just `'python'` it will be found as the
first Python and used to run [JediHTTP][].
-### I want to defer loading of YouCompleteMe until after Vim finishes booting
-
-In recent versions of Vim, you can install YCM in a folder under
-`~/.vim/pack/*/opt` and then load it once the user is idle via an autocommand:
-
-```viml
-augroup load_ycm
- autocmd!
- autocmd CursorHold, CursorHoldI * :packadd YouCompleteMe
- \ | autocmd! load_ycm
-augroup END
-```
-
Contributor Code of Conduct
---------------------------
@@ -128,7 +128,16 @@ let g:ycm_goto_buffer_command =
let g:ycm_disable_for_files_larger_than_kb =
\ get( g:, 'ycm_disable_for_files_larger_than_kb', 1000 )
-call youcompleteme#Enable()
+" On-demand loading. Let's use the autoload folder and not slow down vim's
+" startup procedure.
+if has( 'vim_starting' ) " loading at startup
+ augroup youcompletemeStart
+ autocmd!
+ autocmd VimEnter * call youcompleteme#Enable()
+ augroup END
+else " manual loading with :packadd
+ call youcompleteme#Enable()
+endif
" This is basic vim plugin boilerplate
call s:restore_cpo()

0 comments on commit caa4291

Please sign in to comment.