From 48dcaa02bc9bbfb7626b1095672860f456e312a3 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Thu, 20 Feb 2014 14:32:28 +0100
Subject: [PATCH] Attempted fix at several startup problems.

---
 autoload/UltiSnips/bootstrap.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/autoload/UltiSnips/bootstrap.vim b/autoload/UltiSnips/bootstrap.vim
index 91734a2..50375b1 100644
--- a/autoload/UltiSnips/bootstrap.vim
+++ b/autoload/UltiSnips/bootstrap.vim
@@ -1,10 +1,10 @@
 let s:SourcedFile=expand("<sfile>")
 
 function! UltiSnips#bootstrap#Bootstrap()
-   if exists('did_UltiSnips_bootstrap')
+   if exists('s:did_UltiSnips_bootstrap')
       return
    endif
-   let did_UltiSnips_bootstrap=1
+   let s:did_UltiSnips_bootstrap=1
 
    if !exists("g:UltiSnipsUsePythonVersion")
        let g:_uspy=":py3 "
@@ -13,6 +13,7 @@ function! UltiSnips#bootstrap#Bootstrap()
                if !exists("g:UltiSnipsNoPythonWarning")
                    echo  "UltiSnips requires py >= 2.6 or any py3"
                endif
+               unlet g:_uspy
                finish
            endif
            let g:_uspy=":py "