From c8f553471463ab34774dd47738dcffa7c2c91ca7 Mon Sep 17 00:00:00 2001
From: Steffen Becker <nebelschwade@gmail.com>
Date: Mon, 11 Jun 2012 16:45:57 +0200
Subject: [PATCH] updated some bundles, finally got s-tab working
 (snipmate/supertab-issues overwritten with custom keymapping)

---
 vim/bundle/buffergator       |  2 +-
 vim/bundle/fugitive          |  2 +-
 vim/bundle/html5             |  2 +-
 vim/bundle/scss              |  2 +-
 vim/bundle/snipmate-snippets |  2 +-
 vim/bundle/surround          |  2 +-
 vim/bundle/tlib              |  2 +-
 vimrc                        | 10 +++++-----
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/vim/bundle/buffergator b/vim/bundle/buffergator
index dc879d0..9c9b234 160000
--- a/vim/bundle/buffergator
+++ b/vim/bundle/buffergator
@@ -1 +1 @@
-Subproject commit dc879d00891af7c53242f44ec1b571ee19bd9016
+Subproject commit 9c9b234f550a6dd8c2e4aef66665ea4e95cb8250
diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive
index 1eb4a9f..49c6be3 160000
--- a/vim/bundle/fugitive
+++ b/vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit 1eb4a9f7e32d0da674fbd58c6993f2d27bcecee3
+Subproject commit 49c6be334c0b7950c837bd9f69c30c9f5ccd2e97
diff --git a/vim/bundle/html5 b/vim/bundle/html5
index b8620d9..34b407d 160000
--- a/vim/bundle/html5
+++ b/vim/bundle/html5
@@ -1 +1 @@
-Subproject commit b8620d98a5a328a89e9b4ce74982357de2e47eeb
+Subproject commit 34b407d2344a3c2a94b56e9d443e18e01e8544d9
diff --git a/vim/bundle/scss b/vim/bundle/scss
index d4016f8..07ceacd 160000
--- a/vim/bundle/scss
+++ b/vim/bundle/scss
@@ -1 +1 @@
-Subproject commit d4016f8b31f786d830bb59bb78979c6b5d5a200d
+Subproject commit 07ceacdd49a5bab9f27279ed89550da1927ad3c6
diff --git a/vim/bundle/snipmate-snippets b/vim/bundle/snipmate-snippets
index 9a89900..d9d95a6 160000
--- a/vim/bundle/snipmate-snippets
+++ b/vim/bundle/snipmate-snippets
@@ -1 +1 @@
-Subproject commit 9a899001f7f34e8bfc7507199fe8333fc66f8772
+Subproject commit d9d95a62873af3b36faa338fa6ed9d7de609d29f
diff --git a/vim/bundle/surround b/vim/bundle/surround
index 489a1e8..1a73f60 160000
--- a/vim/bundle/surround
+++ b/vim/bundle/surround
@@ -1 +1 @@
-Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b
+Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3
diff --git a/vim/bundle/tlib b/vim/bundle/tlib
index 4d2b437..7e53a4e 160000
--- a/vim/bundle/tlib
+++ b/vim/bundle/tlib
@@ -1 +1 @@
-Subproject commit 4d2b437055c56cabc65a19044659bc01ff86870b
+Subproject commit 7e53a4e011e89631f065d0d5c24e39cba77f5aa8
diff --git a/vimrc b/vimrc
index b4b2e36..e921185 100644
--- a/vimrc
+++ b/vimrc
@@ -103,8 +103,6 @@ vnoremap / /\v
 " Switch between windows
 nnoremap <tab> <C-w><C-w>
 nnoremap <S-tab> <C-w>W
-" custom shift-tab mapping -- opens new { } and blank line
-inoremap <S-tab> {<Esc>i <Esc>o<CR>}<Esc>ki<tab>
 
 " Search mappings: These will make it so that going to the next one in a
 " search will center on the line it's found in.
@@ -175,7 +173,6 @@ nmap <leader>w :s/\(\%#\w\+\)\(\_W\+\)\(\w\+\)/\3\2\1/<CR>`'
 
 
 " ========== PLugins leaders and other config ==========
-"
 " search using ack
 nnoremap <leader>a :Ack
 
@@ -240,9 +237,13 @@ let g:ctrlp_working_path_mode = 0
 let g:ctrlp_max_height = 12
 let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$\|\.sass-cache$'
 
+" custom shift-tab mapping -- opens new { } and blank line
+" Supertab and snipmate backwards-key are overwritten to use shfit + alt / crtl
+let g:SuperTabMappingBackward = '<s-c-tab>'
+let g:snips_trigger_key_backwards = '<s-m-tab>'
+inoremap <s-tab> {<Esc>i <Esc>o<CR>}<Esc>ki<tab>
 
 " ========== Custom Pseudofunctions ==========
-"
 " add json syntax highlighting
 au BufNewFile,BufRead *.json set ft=javascript
 " typoscript syntax
@@ -258,7 +259,6 @@ endif
 
 
 " ========== On Save ==========
-"
 " A function for stripping Whitespace when saving
 function! <SID>StripTrailingWhitespaces()
   " Preparation: save last search, and cursor position.