From b6bc33f70a25bfe37253e084e708fa318844f239 Mon Sep 17 00:00:00 2001
From: Julio Biason <julio.biason@gmail.com>
Date: Mon, 15 Apr 2013 09:21:44 -0300
Subject: [PATCH] tab jumping now works on both mac and other systems; added
 some more options for rst and some more plugins

---
 configs/vimrc | 75 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 21 deletions(-)

diff --git a/configs/vimrc b/configs/vimrc
index f4ac8f2..aea166d 100644
--- a/configs/vimrc
+++ b/configs/vimrc
@@ -81,6 +81,9 @@ let mapleader=","     " use comma to start user-defined (in plugins) functions
 " spaces are a tab (softtabstop) and break the line at column 78 (textwidth))
 au FileType python set expandtab tabstop=4 shiftwidth=4 softtabstop=4 textwidth=78
 
+" reStructured files follow python closely, but use 3 tab stops instead of 4
+au FileType rst set expandtab tabstop=3 sw=3 sts=3 textwidth=78
+
 " the smarty filetypes doesn't have any sort of indentation, so we set it to
 " auto
 au FileType smarty set ai
@@ -95,6 +98,9 @@ au FileType svn set tw=70
 " email (mostly mutt stuff)
 au FileType mail setlocal spell spelllang=en
 
+" HTML templates do not need breaks
+au FileType htmldjango set textwidth=0
+
 " 256 color terminals
 set t_Co=256
 
@@ -103,27 +109,51 @@ color busybee
 
 " mapings
 " Easy switching between tabs (just use Alt+<tab number>)
-map <M-1> :tabn 1<CR>
-map <M-2> :tabn 2<CR>
-map <M-3> :tabn 3<CR>
-map <M-4> :tabn 4<CR>
-map <M-5> :tabn 5<CR>
-map <M-6> :tabn 6<CR>
-map <M-7> :tabn 7<CR>
-map <M-8> :tabn 8<CR>
-map <M-9> :tabn 9<CR>
-map <M-0> :tabn 10<CR>
-
-imap <M-1> <ESC>:tabn 1<CR>a
-imap <M-2> <ESC>:tabn 2<CR>a
-imap <M-3> <ESC>:tabn 3<CR>a
-imap <M-4> <ESC>:tabn 4<CR>a
-imap <M-5> <ESC>:tabn 5<CR>a
-imap <M-6> <ESC>:tabn 6<CR>a
-imap <M-7> <ESC>:tabn 7<CR>a
-imap <M-8> <ESC>:tabn 8<CR>a
-imap <M-9> <ESC>:tabn 9<CR>a
-imap <M-0> <ESC>:tabn 10<CR>a
+if has('mac')
+	map <D-1> :tabn 1<CR>
+	map <D-2> :tabn 2<CR>
+	map <D-3> :tabn 3<CR>
+	map <D-4> :tabn 4<CR>
+	map <D-5> :tabn 5<CR>
+	map <D-6> :tabn 6<CR>
+	map <D-7> :tabn 7<CR>
+	map <D-8> :tabn 8<CR>
+	map <D-9> :tabn 9<CR>
+	map <D-0> :tabn 10<CR>
+
+	imap <D-1> <ESC>:tabn 1<CR>a
+	imap <D-2> <ESC>:tabn 2<CR>a
+	imap <D-3> <ESC>:tabn 3<CR>a
+	imap <D-4> <ESC>:tabn 4<CR>a
+	imap <D-5> <ESC>:tabn 5<CR>a
+	imap <D-6> <ESC>:tabn 6<CR>a
+	imap <D-7> <ESC>:tabn 7<CR>a
+	imap <D-8> <ESC>:tabn 8<CR>a
+	imap <D-9> <ESC>:tabn 9<CR>a
+	imap <D-0> <ESC>:tabn 10<CR>a
+else
+	map <M-1> :tabn 1<CR>
+	map <M-2> :tabn 2<CR>
+	map <M-3> :tabn 3<CR>
+	map <M-4> :tabn 4<CR>
+	map <M-5> :tabn 5<CR>
+	map <M-6> :tabn 6<CR>
+	map <M-7> :tabn 7<CR>
+	map <M-8> :tabn 8<CR>
+	map <M-9> :tabn 9<CR>
+	map <M-0> :tabn 10<CR>
+
+	imap <M-1> <ESC>:tabn 1<CR>a
+	imap <M-2> <ESC>:tabn 2<CR>a
+	imap <M-3> <ESC>:tabn 3<CR>a
+	imap <M-4> <ESC>:tabn 4<CR>a
+	imap <M-5> <ESC>:tabn 5<CR>a
+	imap <M-6> <ESC>:tabn 6<CR>a
+	imap <M-7> <ESC>:tabn 7<CR>a
+	imap <M-8> <ESC>:tabn 8<CR>a
+	imap <M-9> <ESC>:tabn 9<CR>a
+	imap <M-0> <ESC>:tabn 10<CR>a
+endif
 
 " file auto-completion
 set wim=longest,list
@@ -141,6 +171,9 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-commentary'
 Bundle 'godlygeek/tabular'
 Bundle 'jiangmiao/auto-pairs'
+Bundle 'nvie/vim-flake8'
+Bundle 'scrooloose/nerdtree'
+Bundle 'terryma/vim-multiple-cursors'
 
 " powerline settings
 ""let g:Powerline_symbols = 'fancy'