X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=vim%2Fvimrc;h=070046c4e38198c5063f32fb2aa124b44e4719f4;hb=14c26f56d0f9e84d27b2d6877c05c6d76c37d7a3;hp=e68c9cb60767f6270433cd15ad4b619c3e122a2c;hpb=a3f9febb8a04d66a7af3e0ffee9167e84bf8ba12;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index e68c9cb..070046c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -149,7 +149,7 @@ nmap =	<C-w>=
 nnoremap <C-D>	<C-D>zz
 nnoremap <C-U>	<C-U>zz
 
-nnoremap <SPACE>	<C-F>
+"nnoremap <SPACE>	<C-F>
 nnoremap <S-SPACE>	<C-B>
 nnoremap <BS>	<C-B>
 nnoremap <A-n>	gt
@@ -296,6 +296,10 @@ nnoremap <silent> sr     :FufRenewCache<CR>
 
 "let g:ycm_collect_identifiers_from_tags_files = 1
 "let g:ycm_global_ycm_extra_conf = '~/.vim/bundle/YouCompleteMe/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
+" this is fix youcompleteme python error
+"http://www.cnblogs.com/clivelee/p/4266559.html
+"https://github.com/Valloric/YouCompleteMe/issues/18
+let g:ycm_path_to_python_interpreter= '/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python'
 let g:ycm_auto_trigger = 1
 let g:ycm_seed_identifiers_with_syntax = 1
 let g:ycm_show_diagnostics_ui = 0
@@ -459,8 +463,19 @@ map ej <Plug>(easymotion-j)
 map ek <Plug>(easymotion-k)
 map eb <Plug>(easymotion-b)
 map ew <Plug>(easymotion-w)
+map ee <Plug>(easymotion-w)
 map el <Plug>(easymotion-lineforward)
 map eh <Plug>(easymotion-linebackward)
+
+"map <SPACE>n <Plug>(easymotion-sn)
+"map <SPACE>j <Plug>(easymotion-j)
+"map <SPACE>k <Plug>(easymotion-k)
+"map <SPACE>b <Plug>(easymotion-b)
+"map <SPACE>w <Plug>(easymotion-w)
+"map <SPACE>e <Plug>(easymotion-w)
+"map <SPACE>l <Plug>(easymotion-lineforward)
+"map <SPACE>h <Plug>(easymotion-linebackward)
+
 "" }}}
 " vim-latex --------------------------------------------------------------- {{{
 "set grepprg=grep\ -nH\ $*
@@ -496,9 +511,10 @@ autocmd FileType qf nnoremap <buffer> <silent> q :q<CR> | setlocal nowrap | setl
 autocmd FileType help nnoremap <buffer> <silent> q :q<CR> | vertical resize 85;
 autocmd FileType c,cpp setlocal foldmethod=syntax |
     \ let b:AutoClosePairs = AutoClose#DefaultPairsModified("\"", "{}") |
-	\ inoremap <buffer> { {<CR>}<ESC>kA<CR> |
+	\ inoremap <buffer> { {<CR>}<ESC>kA<CR>|
     \ nnoremap <buffer> <silent> <C-]> :let word=expand("<cword>")<CR>:wincmd o<cr>:vsp<CR>:exec("tag ". word)<cr>zzzr:wincmd w<cr>
-autocmd FileType python setlocal foldmethod=indent
+autocmd FileType python setlocal foldmethod=indent |
+    \ set list
 
 autocmd FileType xml setlocal foldmethod=syntax |
 	\ let g:xml_syntax_folding=1
@@ -506,6 +522,10 @@ autocmd FileType vim setlocal foldmethod=marker |
 	\ setlocal formatoptions-=c formatoptions-=r formatoptions-=o |
     \ let b:AutoClosePairs = AutoClose#DefaultPairsModified("", "{} \"")
 
+autocmd FileType perl setlocal foldmethod=syntax |
+    \ let b:AutoClosePairs = AutoClose#DefaultPairsModified("\"", "{}") |
+	\ inoremap <buffer> { {<CR>}<ESC>kA<CR>
+
 autocmd Filetype markdown setlocal textwidth=80
 
 autocmd CmdwinEnter * map <buffer> q :q<CR>
@@ -618,7 +638,7 @@ nnoremap \d :call DiffToggle()<CR>
 " }}}
 
 "nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
-nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
+nnoremap <silent> <cr> @=(foldlevel('.')?'za':"\<Space>")<CR>
 "noremap <Leader>d	@=(&diff)?':diffoff':":VCSVimDiff"<CR><CR>
 
 " https://bitbucket.org/sjl/dotfiles/src/tip/vim/vimrc