Merge branch 'master' of tardis:dotfiles

diff --git a/vim/after/plugin/togglenumber.vim b/vim/after/plugin/togglenumber.vim
new file mode 100644 (file)
index 0000000..14bdafa
--- /dev/null
+++ b/vim/after/plugin/togglenumber.vim
@@ -0,0 +1,15 @@
+" Toggle line numbers {{{1
+" needs to be here to override unimpaired maps
+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 con :call g:ToggleNumber()<cr>

diff --git a/vim/vimrc b/vim/vimrc
index e1e5a291ae2b8c0c9980d98e5892454f221f7d38..810f2f58f686c199a8ccd84bd7aeb3aaf4ba2783 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -532,19 +532,3 @@ nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
 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>