changeset 72:808e110f4171

Replace clang_complete with marching
author zegervdv <zegervdv@me.com>
date Sat, 28 Jun 2014 17:53:29 +0200
parents e9808e6e7cd4
children 7e8afb2b01bf
files .hgsub .hgsubstate vimrc
diffstat 3 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Sat Jun 28 17:46:13 2014 +0200
+++ b/.hgsub	Sat Jun 28 17:53:29 2014 +0200
@@ -53,3 +53,6 @@
 vim/bundle/rspec-syntax = [git]https://github.com/sheerun/rspec.vim.git
 vim/bundle/git = [git]https://github.com/tpope/vim-git.git
 vim/bundle/merginal = [git]https://github.com/idanarye/vim-merginal.git
+vim/bundle/vimproc = [git]https://github.com/Shougo/vimproc.vim
+vim/bundle/reunions = [git]https://github.com/osyo-manga/vim-reunions
+vim/bundle/marching = [git]https://github.com/osyo-manga/vim-marching.git
--- a/.hgsubstate	Sat Jun 28 17:46:13 2014 +0200
+++ b/.hgsubstate	Sat Jun 28 17:53:29 2014 +0200
@@ -20,6 +20,7 @@
 81b7e5584f69340eec92088efda893d959d6df3a vim/bundle/hybrid
 eec1b629dc4cfa3986d20f21d4b4489732cd3f5a vim/bundle/indent-guides
 eaa765eeadb51c3a8e2caf16d1e67359bf89cab9 vim/bundle/latex
+3c141527ba0b217976a4b07eaad540db82935d4a vim/bundle/marching
 cd81c2f209f3ab813b5bd6012fa513b434ef1249 vim/bundle/markdown
 b7963a4af885ce600c3d9400cb6002a2310ddc4f vim/bundle/merginal
 81fdec8317a53695fb9d27eaad344da55eb159e6 vim/bundle/misc
@@ -31,6 +32,7 @@
 dd922269dd9ea4fea6d44a0eebdc95e0ff224d37 vim/bundle/rake
 79a33164cade37f922cc1e2a16eaca3533aa0274 vim/bundle/rbenv
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
+42cf8386bc79849737b1b5b1b14b23b77404ec0e vim/bundle/reunions
 94a256b7e02f5056cab197d9b079901858737324 vim/bundle/rspec
 95e547f087534e8d9f6613c86c69265f1a4dd226 vim/bundle/rspec-syntax
 3e1e8cf48c2cf37baa90f151375ca117776bed2a vim/bundle/ruby
@@ -49,6 +51,7 @@
 7bfdda29120dbab0787c966dd35db025305675e1 vim/bundle/tomdoc
 6c7b03a2a0abdfd0dabd26602f8a32955abe0181 vim/bundle/vhdl
 d98a032fec5a11716b324a3d4ae2b96c57cd1221 vim/bundle/vim-session
+f083b7db0749b8fbc0826b308a42c252e804dbf6 vim/bundle/vimproc
 2c03d82a0e4662adf1e347487d73a9bf4bf6fdac vim/bundle/vimwiki
 22fa4e57fa3b0e4c9a83de51717b621fe9ca8cd7 vim/bundle/vis
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
--- a/vimrc	Sat Jun 28 17:46:13 2014 +0200
+++ b/vimrc	Sat Jun 28 17:53:29 2014 +0200
@@ -298,15 +298,8 @@
       \ '[^.[:digit:] *\t]\%(\.\|->\)\w*'
 let g:neocomplete#force_omni_input_patterns.objcpp =
       \ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
-let g:clang_complete_auto = 0
-let g:clang_auto_select = 0
-let g:clang_debug = 1
-"let g:clang_use_library = 1
-let s:clang_library_path='/Library/Developer/CommandLineTools/usr/lib'
 
-if isdirectory(s:clang_library_path)
-    let g:clang_library_path=s:clang_library_path
-endif
+let g:marching_enable_neocomplete = 1
 
 autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
 autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags