vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #2554 - micbou:gui-running, r=puremourning

Browse Source 
[READY] Use gui_running instead of gui to defer YCM loading at VimEnter

`has('gui')` returns `1` even in console Vim if it is compiled with `+gui`. We should use `gui_running` instead. See 1d1a4f4cff (commitcomment-20876179).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/2554)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2017-02-27 07:23:06 +09:00
commit 39659caf34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/youcompleteme.vim
View File

@ -128,7 +128,7 @@ let g:ycm_goto_buffer_command =
let g:ycm_disable_for_files_larger_than_kb = let g:ycm_disable_for_files_larger_than_kb =
\ get( g:, 'ycm_disable_for_files_larger_than_kb', 1000 ) \ get( g:, 'ycm_disable_for_files_larger_than_kb', 1000 )
if has( 'vim_starting' ) && has( 'gui' ) " loading at startup, in gui if has( 'vim_starting' ) && has( 'gui_running' ) " Loading at startup, in gui.
" We defer loading until after VimEnter to allow the gui to fork (see " We defer loading until after VimEnter to allow the gui to fork (see
" `:h gui-fork`) and avoid a deadlock situation, as explained here: " `:h gui-fork`) and avoid a deadlock situation, as explained here:
" https://github.com/Valloric/YouCompleteMe/pull/2473#issuecomment-267716136 " https://github.com/Valloric/YouCompleteMe/pull/2473#issuecomment-267716136
@ -136,7 +136,7 @@ if has( 'vim_starting' ) && has( 'gui' ) " loading at startup, in gui
autocmd! autocmd!
autocmd VimEnter * call youcompleteme#Enable() autocmd VimEnter * call youcompleteme#Enable()
augroup END augroup END
else " manual loading with :packadd, or not starting the gui else " Manual loading with :packadd, or not starting the gui.
call youcompleteme#Enable() call youcompleteme#Enable()
endif endif