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

diff -r b059a86fd333 -r e26070847abc doc/gundo.txt
--- a/doc/gundo.txt	Wed Mar 09 22:57:39 2011 +0100
+++ b/doc/gundo.txt	Wed Mar 09 19:35:49 2011 -0500
@@ -14,6 +14,8 @@
         3.4 gundo_right ............... |gundo_right|
         3.5 gundo_help ................ |gundo_help|
         3.6 gundo_disable ............. |gundo_disable|
+        3.7 gundo_map_move_older ...... |gundo_map_move_older|
+            gundo_map_move_newer ...... |gundo_map_move_newer|
     4. License ........................ |GundoLicense|
     5. Bugs ........................... |GundoBugs|
     6. Contributing ................... |GundoContributing|
@@ -176,6 +178,16 @@
 
 Default: 0 (Gundo is enabled as usual)
 
+------------------------------------------------------------------------------
+3.7 g:gundo_map_move_older, g:gundo_map_move_newer      *gundo_map_move_older*
+                                                        *gundo_map_move_newer*
+
+These options let you change the keys that navigate the undo graph. This is
+useful if you use a Dvorak keyboard and have changed your movement keys.
+
+Default: gundo_map_move_older = "j"
+         gundo_map_move_newer = "k"
+
 ==============================================================================
 4. License                                                      *GundoLicense*
 
diff -r b059a86fd333 -r e26070847abc plugin/gundo.vim
--- a/plugin/gundo.vim	Wed Mar 09 22:57:39 2011 +0100
+++ b/plugin/gundo.vim	Wed Mar 09 19:35:49 2011 -0500
@@ -60,6 +60,12 @@
 if !exists('g:gundo_help')"{{{
     let g:gundo_help = 1
 endif"}}}
+if !exists("g:gundo_map_move_older")"{{{
+    let g:gundo_map_move_older = 'j'
+endif"}}}
+if !exists("g:gundo_map_move_newer")"{{{
+    let g:gundo_map_move_newer = 'k'
+endif"}}}
 
 "}}}
 
@@ -426,10 +432,10 @@
 "{{{ Gundo buffer settings
 
 function! s:GundoMapGraph()"{{{
+    exec 'nnoremap <script> <silent>' . g:gundo_map_move_older . " :call <sid>GundoMove(1)<CR>"
+    exec 'nnoremap <script> <silent>' . g:gundo_map_move_newer . " :call <sid>GundoMove(-1)<CR>"
     nnoremap <script> <silent> <buffer> <CR>          :call <sid>GundoRevert()<CR>
     nnoremap <script> <silent> <buffer> o             :call <sid>GundoRevert()<CR>
-    nnoremap <script> <silent> <buffer> j             :call <sid>GundoMove(1)<CR>
-    nnoremap <script> <silent> <buffer> k             :call <sid>GundoMove(-1)<CR>
     nnoremap <script> <silent> <buffer> <down>        :call <sid>GundoMove(1)<CR>
     nnoremap <script> <silent> <buffer> <up>          :call <sid>GundoMove(-1)<CR>
     nnoremap <script> <silent> <buffer> gg            gg:call <sid>GundoMove(1)<CR>
diff -r b059a86fd333 -r e26070847abc site/index.html
--- a/site/index.html	Wed Mar 09 22:57:39 2011 +0100
+++ b/site/index.html	Wed Mar 09 19:35:49 2011 -0500
@@ -96,6 +96,7 @@
                             <li><a href="#gundo_right">g:gundo_right</a></li>
                             <li><a href="#gundo_help">g:gundo_help</a></li>
                             <li><a href="#gundo_disable">g:gundo_disable</a></li>
+                            <li><a href="#gundo_map_move">g:gundo_map_move_[older/newer]</a></li>
                         </ul>
                     </li>
                     <li><a href="#license">License</a></li>
@@ -302,6 +303,21 @@
                 </p>
 
                 <p>Default: 0 (Gundo is enabled as usual)</p>
+
+                <a name="gundo_map_move"></a>
+                <h2>g:gundo_map_move_[older/newer]</h2>
+
+                <p>
+                    These options let you change the keys that navigate the
+                    undo graph. This is useful if you use a Dvorak keyboard and
+                    have changed your movement keys.
+                </p>
+
+                <p>
+                    Default:<br/>
+                    gundo_map_move_older: "j"<br/>
+                    gundo_map_move_newer: "k"
+                </p>
             </section>
             <section>
                 <a name="license"></a>
diff -r b059a86fd333 -r e26070847abc site/publish.sh
--- a/site/publish.sh	Wed Mar 09 22:57:39 2011 +0100
+++ b/site/publish.sh	Wed Mar 09 19:35:49 2011 -0500
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+hg -R ~/src/sjl.bitbucket.org pull -u
 rsync --delete -az . ~/src/sjl.bitbucket.org/gundo.vim
 hg -R ~/src/sjl.bitbucket.org commit -Am 'gundo.vim: Update documentation.'
 hg -R ~/src/sjl.bitbucket.org push