fix conflict

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 2971615..12c7833 100644 (file)
--- 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
@@ -507,7 +507,7 @@ 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