# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1373502713 14400
# Node ID 0f7a6bcde76c0c4be48df3843c0e54b9c22ec674
# Parent  d7e1349992ccf79c005f48a1d0d5b37d4f196362# Parent  9d570ff173729b36e121ed81572add335270b734
Merge.

diff -r d7e1349992cc -r 0f7a6bcde76c autoload/gundo.py
--- a/autoload/gundo.py	Wed Jul 10 20:31:27 2013 -0400
+++ b/autoload/gundo.py	Wed Jul 10 20:31:53 2013 -0400
@@ -526,6 +526,7 @@
 
     target_n = int(vim.eval('s:GundoGetTargetState()'))
     back = int(vim.eval('g:gundo_target_n'))
+    delay = int(vim.eval('g:gundo_playback_delay'))
 
     vim.command('echo "%s"' % back)
 
@@ -572,7 +573,7 @@
         normal('zz')
         _goto_window_for_buffer(back)
         vim.command('redraw')
-        vim.command('sleep 60m')
+        vim.command('sleep %dm' % delay)
 
 def initPythonModule():
     if sys.version_info[:2] < (2, 4):
diff -r d7e1349992cc -r 0f7a6bcde76c autoload/gundo.vim
--- a/autoload/gundo.vim	Wed Jul 10 20:31:27 2013 -0400
+++ b/autoload/gundo.vim	Wed Jul 10 20:31:53 2013 -0400
@@ -49,6 +49,9 @@
 if !exists("g:gundo_auto_preview")"{{{
     let g:gundo_auto_preview = 1
 endif"}}}
+if !exists("g:gundo_playback_delay")"{{{
+    let g:gundo_playback_delay = 60
+endif"}}}
 
 let s:has_supported_python = 0
 if g:gundo_prefer_python3 && has('python3')"{{{
diff -r d7e1349992cc -r 0f7a6bcde76c doc/gundo.txt
--- a/doc/gundo.txt	Wed Jul 10 20:31:27 2013 -0400
+++ b/doc/gundo.txt	Wed Jul 10 20:31:53 2013 -0400
@@ -20,6 +20,7 @@
         3.9  gundo_preview_statusline .. |gundo_preview_statusline|
              gundo_tree_statusline ..... |gundo_tree_statusline|
         3.10 gundo_auto_preview ........ |gundo_auto_preview|
+        3.11 gundo_playback_delay ...... |gundo_playback_delay|
     4. License ......................... |GundoLicense|
     5. Bugs ............................ |GundoBugs|
     6. Contributing .................... |GundoContributing|
@@ -216,6 +217,15 @@
 
 Default: 1 (automatically preview diffs)
 
+------------------------------------------------------------------------------
+3.11 g:gundo_playback_delay                             *gundo_playback_delay*
+
+This is the delay in milliseconds between each change when running 'play to'
+mode. Set this to a higher number for a slower playback or to a lower number
+for a faster playback.
+
+Default: 60
+
 ==============================================================================
 4. License                                                      *GundoLicense*