Merge branch 'master' into dev

Conflicts:
	autoload/youcompleteme.vim
This commit is contained in:
Strahinja Val Markovic 2012-07-26 12:59:06 -07:00
commit 68156e8b47
2 changed files with 14 additions and 0 deletions

View File

@ -27,6 +27,12 @@ let s:completion_start_column = 0
let g:ycm_min_num_of_chars_for_completion = 2 let g:ycm_min_num_of_chars_for_completion = 2
function! youcompleteme#Enable() function! youcompleteme#Enable()
" If the user set the current filetype as a filetype that YCM should ignore,
" then we don't do anything
if get( g:ycm_filetypes_to_ignore, &filetype, 0 )
return
endif
augroup youcompleteme augroup youcompleteme
autocmd! autocmd!
autocmd CursorMovedI * call s:OnMovedI() autocmd CursorMovedI * call s:OnMovedI()

View File

@ -25,6 +25,14 @@ elseif v:version < 703 || !has( 'patch584' )
endif endif
let g:loaded_youcompleteme = 1 let g:loaded_youcompleteme = 1
if !exists( 'g:ycm_min_num_of_chars_for_completion' )
let g:ycm_min_num_of_chars_for_completion = 2
endif
if !exists( 'g:ycm_filetypes_to_ignore' )
let g:ycm_filetypes_to_ignore = { 'notes' : 1 }
endif
" This is basic vim plugin boilerplate " This is basic vim plugin boilerplate
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim