# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1299717349 18000
# Node ID e26070847abcc47fd840120a0ac923a19aa42d94
# Parent  0e7247b22a443134157c2dd6e043a1197d6d7c16# Parent  b059a86fd3334e35d7076ff06cfdecfc9b5bedd1
Merge.

diff -r 0e7247b22a44 -r e26070847abc plugin/gundo.vim
--- a/plugin/gundo.vim	Wed Mar 09 19:35:42 2011 -0500
+++ b/plugin/gundo.vim	Wed Mar 09 19:35:49 2011 -0500
@@ -17,10 +17,10 @@
 let loaded_gundo = 1"}}}
 
 if v:version < '703'"{{{
-	function! s:GundoDidNotLoad()
-		echohl WarningMsg|echomsg "Gundo unavailable: requires Vim 7.3+"|echohl None
-	endfunction
-	command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
+    function! s:GundoDidNotLoad()
+        echohl WarningMsg|echomsg "Gundo unavailable: requires Vim 7.3+"|echohl None
+    endfunction
+    command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
     finish
 endif"}}}
 
@@ -33,15 +33,15 @@
 if sys.version_info[:2] < (2, 4):
     vim.command('let s:has_supported_python = 0')
 ENDPYTHON
+else
+    let s:has_supported_python = 0
+endif
 
-    " Python version is too old
-    if !s:has_supported_python
-        echo  "Gundo requires that Vim be compiled with Python 2.4+"
-        finish
-    endif
-else
-    " no Python support
-    echo  "Gundo requires that Vim be compiled with Python 2.4+"
+if !s:has_supported_python
+    function! s:GundoDidNotLoad()
+        echohl WarningMsg|echomsg "Gundo requires Vim to be compiled with Python 2.4+"|echohl None
+    endfunction
+    command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
     finish
 endif"}}}