0f7a6bcde76c
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Wed, 10 Jul 2013 20:31:53 -0400 |
parents | d7e1349992cc (diff) 9d570ff17372 (current diff) |
children | 21f77aad8ca8 |
branches/tags | (none) |
files | autoload/gundo.py doc/gundo.txt |
Changes
--- a/autoload/gundo.py Mon Apr 15 22:32:39 2013 +0800 +++ b/autoload/gundo.py Wed Jul 10 20:31:53 2013 -0400 @@ -273,7 +273,7 @@ INLINE_HELP = '''\ " Gundo for %s (%d) -" j/k - move between undo states +" %s/%s - move between undo states " p - preview diff of selected and current states " <cr> - revert to selected state @@ -424,9 +424,11 @@ result = [' ' + l for l in result] target = (vim.eval('g:gundo_target_f'), int(vim.eval('g:gundo_target_n'))) + mappings = (vim.eval('g:gundo_map_move_older'), + vim.eval('g:gundo_map_move_newer')) if int(vim.eval('g:gundo_help')): - header = (INLINE_HELP % target).splitlines() + header = (INLINE_HELP % (target + mappings)).splitlines() else: header = []
--- a/doc/gundo.txt Mon Apr 15 22:32:39 2013 +0800 +++ b/doc/gundo.txt Wed Jul 10 20:31:53 2013 -0400 @@ -249,6 +249,8 @@ ============================================================================== 7. Changelog *GundoChangelog* +v2.4.1 + * Fix the help window to take custom mappings into account. v2.4.0 * Add auto preview option. * Add 'r' mapping to preview current state.