# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1449503713 0
# Node ID 4206a55f9922d21568780af8f2896ddc88c81bd7
# Parent  82d287f206dc4008c0359c953defd14ce775c9df# Parent  80be9ec7656dac2388d6c87ab2e7786f52783d75
Merge.

diff -r 82d287f206dc -r 4206a55f9922 autoload/gundo.py
--- a/autoload/gundo.py	Thu Aug 22 11:11:24 2013 -0400
+++ b/autoload/gundo.py	Mon Dec 07 15:55:13 2015 +0000
@@ -361,7 +361,7 @@
 
         before_name = 'Original'
         before_time = ''
-        after_name = node_after.n
+        after_name = str(node_after.n)
         after_time = _fmt_time(node_after.time)
     else:
         _undo_to(node_before.n)
@@ -370,9 +370,9 @@
         _undo_to(node_after.n)
         after_lines = vim.current.buffer[:]
 
-        before_name = node_before.n
+        before_name = str(node_before.n)
         before_time = _fmt_time(node_before.time)
-        after_name = node_after.n
+        after_name = str(node_after.n)
         after_time = _fmt_time(node_after.time)
 
     _undo_to(current)
@@ -390,9 +390,9 @@
     _undo_to(node_after.n)
     after_lines = vim.current.buffer[:]
 
-    before_name = node_before.n or 'Original'
+    before_name = str(node_before.n or 'Original')
     before_time = node_before.time and _fmt_time(node_before.time) or ''
-    after_name = node_after.n or 'Original'
+    after_name = str(node_after.n or 'Original')
     after_time = node_after.time and _fmt_time(node_after.time) or ''
 
     _undo_to(current)
diff -r 82d287f206dc -r 4206a55f9922 autoload/gundo.vim
--- a/autoload/gundo.vim	Thu Aug 22 11:11:24 2013 -0400
+++ b/autoload/gundo.vim	Mon Dec 07 15:55:13 2015 +0000
@@ -283,10 +283,10 @@
 function! s:GundoOpen()"{{{
     if !exists('g:gundo_py_loaded')
         if s:has_supported_python == 2 && g:gundo_prefer_python3
-            exe 'py3file ' . s:plugin_path . '/gundo.py'
+            exe 'py3file ' . escape(s:plugin_path, ' ') . '/gundo.py'
             python3 initPythonModule()
         else
-            exe 'pyfile ' . s:plugin_path . '/gundo.py'
+            exe 'pyfile ' . escape(s:plugin_path, ' ') . '/gundo.py'
             python initPythonModule()
         endif