vim: use wilywampa's fork for python-mode

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 160aba896c5f700c515433632fd3fff90a6f61ba..f9f891c1f16b90fb9e5f6700abd263dd250b0108 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -21,7 +21,8 @@ Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'junegunn/vim-easy-align'
 Plugin 'kien/ctrlp.vim'
-Plugin 'klen/python-mode'
+" Plugin 'klen/python-mode'
+Plugin 'wilywampa/python-mode'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'raimondi/delimitmate'
@@ -268,9 +269,6 @@ nnoremap <silent> <Leader>/ :silent nohl<CR>
 nnoremap <leader>[ :tabprev<cr>
 nnoremap <leader>] :tabnext<cr>
 
-" Wrap
-nnoremap <leader>W :set wrap!<cr>
-
 " paste from selection
 nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard
@@ -289,9 +287,6 @@ noremap ' `
 " Select (charwise) the contents of the current line, excluding indentation.
 nnoremap vv ^vg_
 
-" Toggle [i]nvisible characters
-nnoremap <leader>i :set list!<cr>
-
 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
 
@@ -378,8 +373,7 @@ noremap <silent> <Leader>O :set paste<CR>m`O<ESC>``:set nopaste<CR>
 " Don't use Ex mode, use Q for formatting
 map Q gq
 
-" allow undoing in insert-mode
-inoremap <C-U> <C-G>u<C-U>
+" break undo sequence before removing word
 inoremap <C-W> <C-G>u<C-W>
 
 nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
@@ -398,6 +392,9 @@ autocmd BufWinEnter *.* silent loadview
 " save with sudo
 cnoremap w!! w !sudo tee % > /dev/null
 
+" uppercase previous word
+inoremap <C-C> <Esc>gUiwgi
+
 " plugins options {{{1
 " ag {{{2
 let g:AgSmartCase = 1