Mercurial > dotfiles.old
changeset 29:599325301323
Configure neocomplete
| author | zegervdv <zegervdv@me.com> |
|---|---|
| date | Tue, 01 Apr 2014 20:46:24 +0200 |
| parents | e7be1e1656d1 |
| children | 7dfc911400a3 |
| files | gitconfig vimrc |
| diffstat | 2 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gitconfig Sun Mar 30 23:05:02 2014 +0200 +++ b/gitconfig Tue Apr 01 20:46:24 2014 +0200 @@ -20,7 +20,7 @@ [mergetool] keepBackup = false [difftool] - prompt = false + prompt = false [help] autocorrect = 1 [include] @@ -33,3 +33,7 @@ default = simple [init] templatedir = ~/.templates/git +[diff] + tool = mvimdiff +[difftool "mvimdiff"] + cmd = mvim -f -d \"$LOCAL\" \"$REMOTE\"
--- a/vimrc Sun Mar 30 23:05:02 2014 +0200 +++ b/vimrc Tue Apr 01 20:46:24 2014 +0200 @@ -233,11 +233,12 @@ nmap <leader>c <C-_><C-_> " Neo Complete -let g:acp_enableAtStartup=0 -let g:neocomplete#enable_at_startup=1 -let g:neocomplete#enable_smart_case=1 -let g:neocomplete#sources#syntax#min_keyword_length=3 -let g:neocomplete#lock_buffer_name_pattern = '\*ku\*' +let g:acp_enableAtStartup = 0 +let g:neocomplete#enable_at_startup = 1 +let g:neocomplete#enable_smart_case = 1 +let g:neocomplete#enable_fuzzy_completion = 1 +let g:neocomplete#sources#syntax#min_keyword_length = 3 +let g:neocomplete#lock_buffer_name_pattern = '\*ku\*' " Define dictionary. let g:neocomplete#sources#dictionary#dictionaries = { @@ -256,9 +257,9 @@ " <CR>: close popup and save indent. inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR> function! s:my_cr_function() - return neocomplete#close_popup() . "\<CR>" + " return neocomplete#close_popup() . "\<CR>" " For no inserting <CR> key. - "return pumvisible() ? neocomplete#close_popup() : "\<CR>" + return pumvisible() ? neocomplete#close_popup() : "\<CR>" endfunction " <TAB>: completion. inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" @@ -283,7 +284,7 @@ \ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*' let g:clang_complete_auto = 0 let g:clang_auto_select = 0 -"let g:clang_use_library = 1 +let g:clang_use_library = 1 autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags