From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 9 Feb 2015 14:33:27 +0000 (+0000)
Subject: Merge branch 'master' of tardis:dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/f25da6e7e7c09d7c5407a3fe6d2d3a7cdb0c695c?hp=-c

Merge branch 'master' of tardis:dotfiles
---

f25da6e7e7c09d7c5407a3fe6d2d3a7cdb0c695c
diff --combined vim/vimrc
index 14ebec3,e1e5a29..810f2f5
--- a/vim/vimrc
+++ b/vim/vimrc
@@@ -438,6 -438,7 +438,7 @@@ autocmd bufenter * if (winnr("$") == 1 
  " python-mode {{{2
  
  let g:pymode_rope_completion = 0
+ let g:pymode_rope = 0
  let g:pymode_folding = 1
  
  " synastic {{{2
@@@ -531,3 -532,19 +532,3 @@@ nnoremap <silent> <Leader>s :call Toggl
  nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
  " fix spelling with first choice
  nnoremap <Leader>f 1z=
 -
 -" Toggle line numbers {{{2
 -function! g:ToggleNumber()
 -    if !exists("b:relanum")
 -        let b:relanum=1
 -    endif
 -    if &l:number
 -        let b:relanum = &relativenumber
 -        setlocal nonumber norelativenumber
 -    else
 -        let &l:relativenumber = b:relanum
 -        setlocal number
 -    endif
 -endfunction
 -nnoremap <silent><leader>n :call g:ToggleNumber()<cr>
 -nnoremap <silent><leader>N :setlocal relativenumber!<cr>