From 238e9375005a476af14b92d41447cb18daf88358 Mon Sep 17 00:00:00 2001
From: Michael Sanders <msanders42@gmail.com>
Date: Thu, 26 Mar 2009 00:21:04 -0400
Subject: [PATCH] added a cleaner fix for supertab

---
 plugin/snipMate.vim | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/plugin/snipMate.vim b/plugin/snipMate.vim
index 5855d1f..790c041 100644
--- a/plugin/snipMate.vim
+++ b/plugin/snipMate.vim
@@ -119,17 +119,21 @@ fun! GetSnippets(dir)
 endf
 
 fun! TriggerSnippet()
+	if exists('g:SuperTabMappingForward')
+		if g:SuperTabMappingForward == "<tab>"
+			let g:SuperTabKey = "\<c-n>"
+		elseif g:SuperTabMappingBackward == "<tab>"
+			let g:SuperTabKey = '\<c-p>'
+		endif
+	endif
+
 	if pumvisible() " Update snippet if completion is used, or deal with supertab
-		if exists('s:sid')
-			return exists('b:complType') ? b:complType : "\<c-n>"
+		if exists('g:SuperTabKey')
+			call feedkeys(g:SuperTabKey) | return ''
 		endif
 		call feedkeys("\<esc>a", 'n') " Close completion menu
 		call feedkeys("\<tab>") | return ''
 	endif
-	if !exists('s:sid') && exists('g:SuperTabMappingForward')
-				\ && g:SuperTabMappingForward == "<tab>"
-		call s:GetSuperTabSID()
-	endif
 
 	if exists('g:snipPos') | return snipMate#jumpTabStop() | endif
 
@@ -148,14 +152,7 @@ fun! TriggerSnippet()
 		sil exe 's/'.escape(trigger, '.^$/\*[]').'\%#//'
 		return snipMate#expandSnip(col)
 	endif
-	return exists('s:sid') ? {s:sid}_SuperTab('n') : "\<tab>"
-endf
-
-fun s:GetSuperTabSID()
-	let old = @a
-	redir @a | sil exe 'fun /SuperTab$' | redir END
-	let s:sid = matchstr(@a, '<SNR>\d\+\ze_SuperTab(command)')
-	let @a = old
+	return exists('g:SuperTabKey') ? g:SuperTabKey : "\<tab>"
 endf
 
 " Check if word under cursor is snippet trigger; if it isn't, try checking if