# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1404345790 14400
# Node ID f7fa87987e4f60f336cad94e18a0964ee0519b50
# Parent  3b143e1db5af33b7d58cfdd7e972a42f6468b2bc# Parent  db3183c639f965020789d313071775dc1f924afb
Merge from default

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -59,6 +59,7 @@ end
   Plugin 'Shougo/unite.vim'
   Plugin 'Shougo/vimshell.vim'
   Plugin 'Shougo/vimfiler.vim'
+  Plugin 'Shougo/neocomplcache.vim'
   Plugin 'sjl/gundo.vim'
   Plugin 'majutsushi/tagbar'
   Plugin 'godlygeek/tabular'
@@ -317,6 +318,15 @@ let g:signify_mapping_next_hunk = '<lead
 let g:signify_mapping_prev_hunk = '<leader>gk'
 let g:signify_mapping_toggle = '<leader>gt'
 
+" > neocomplcache
+" Disable AutoComplPop.
+let g:acp_enableAtStartup = 0
+
+" Use neocomplcache.
+let g:neocomplcache_enable_at_startup = 1
+let g:neocomplcache_enable_smart_case = 1
+let g:neocomplcache_min_syntax_length = 3
+
 " }}}