summaryrefslogtreecommitdiff
path: root/autoload/deoplete/init.vim
diff options
context:
space:
mode:
authorShougo Matsushita <Shougo.Matsu@gmail.com>2016-01-12 22:11:26 +0900
committerShougo Matsushita <Shougo.Matsu@gmail.com>2016-01-12 22:11:26 +0900
commit5cfeab59dccf3015fa0bf829ff4b7ec5e376aec8 (patch)
treec8780e2534b403219e1c4ca163aa216465140515 /autoload/deoplete/init.vim
parent5645c73a91a66213261d1abfe8e76920019f0f32 (diff)
downloaddeoplete.nvim-5cfeab59dccf3015fa0bf829ff4b7ec5e376aec8.zip
Fix #116 #120 ignore_sources problem
Diffstat (limited to 'autoload/deoplete/init.vim')
-rw-r--r--autoload/deoplete/init.vim21
1 files changed, 5 insertions, 16 deletions
diff --git a/autoload/deoplete/init.vim b/autoload/deoplete/init.vim
index 45d7d4d..5633be6 100644
--- a/autoload/deoplete/init.vim
+++ b/autoload/deoplete/init.vim
@@ -199,7 +199,11 @@ function! deoplete#init#_context(event, sources) abort "{{{
let sources = a:sources
if a:event !=# 'Manual' && empty(sources)
" Use default sources
- let sources = s:get_sources(filetype)
+ let sources = deoplete#util#get_buffer_config(
+ \ filetype,
+ \ 'b:deoplete_sources',
+ \ 'g:deoplete#sources',
+ \ '{}', [])
endif
let keyword_patterns = join(deoplete#util#convert2list(
@@ -230,19 +234,4 @@ function! deoplete#init#_context(event, sources) abort "{{{
\ }
endfunction"}}}
-function! s:get_sources(filetype) abort "{{{
- let sources = deoplete#util#get_buffer_config(
- \ a:filetype,
- \ 'b:deoplete_sources',
- \ 'g:deoplete#sources',
- \ '{}', [])
- let ignore_sources = deoplete#util#get_buffer_config(
- \ a:filetype,
- \ 'b:deoplete_ignore_sources', 'g:deoplete#ignore_sources',
- \ '{}', [])
-
- " Ignore sources
- return filter(sources, "index(ignore_sources, v:val) < 0")
-endfunction"}}}
-
" vim: foldmethod=marker