X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=vim%2Fvimrc;h=2c1cdfbaaa58cbeca4f69ad324826d5d91764e51;hb=6ad1dd4a80e86afb1ad40888e449d99488f45add;hp=12c7833afd2383b6175c4deed2e0f6ab2d139da8;hpb=3f6be1036862ef97dd2ddb4ba4e1bc40803e51ec;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index 12c7833..2c1cdfb 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -171,7 +171,7 @@ nnoremap <Leader>r	:registers<CR>
 nnoremap <Leader>a :
 
 nmap <Leader>p	"*p
-
+" also works :r !pbpaste<CR>
 
 nmap <A-=> :resize<CR>:vertical resize<CR>
 nmap = :resize<CR>:vertical resize<CR>
@@ -295,7 +295,11 @@ nnoremap <silent> sr     :FufRenewCache<CR>
 "syntax on, must before the YCM,
 
 "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'
+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
@@ -509,7 +513,8 @@ autocmd FileType c,cpp setlocal foldmethod=syntax |
     \ let b:AutoClosePairs = AutoClose#DefaultPairsModified("\"", "{}") |
 	\ 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
@@ -519,7 +524,7 @@ autocmd FileType vim setlocal foldmethod=marker |
 
 autocmd FileType perl setlocal foldmethod=syntax |
     \ let b:AutoClosePairs = AutoClose#DefaultPairsModified("\"", "{}") |
-	\ inoremap <buffer> { {<CR>}<ESC>kA<CR>
+	\ inoremap <buffer> {<CR> {<CR>}<ESC>kA<CR>
 
 autocmd Filetype markdown setlocal textwidth=80
 
@@ -688,3 +693,5 @@ nnoremap <Leader>m  :marks abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<
 "                          \ 'undo', 'line', 'changes', 'mixed', 'bookmarkdir']
 
 
+"" TODO: 
+""