12 Commits

Author SHA1 Message Date
Marius Gedminas
e5dc5f23b8 Fix TypeError when using Python 3
The error shows up on :Gundo and looks like this:

    Error detected while processing function gundo#GundoShow[1]..<SNR>116_GundoShow[4]..<SNR>116_GundoOpen[31]..<SNR>116_GundoRenderPreview:
    line    2:
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
      File "/home/mg/.vim/bundle/Gundo/autoload/gundo.py", line 474, in GundoRenderPreview
        _output_preview_text(_generate_preview_diff(current, node_before, node_after))
      File "/home/mg/.vim/bundle/Gundo/autoload/gundo.py", line 382, in _generate_preview_diff
        before_time, after_time))
      File "/usr/lib/python3.5/difflib.py", line 1177, in unified_diff
        _check_types(a, b, fromfile, tofile, fromfiledate, tofiledate, lineterm)
      File "/usr/lib/python3.5/difflib.py", line 1312, in _check_types
        raise TypeError('all arguments must be str, not: %r' % (arg,))
    TypeError: all arguments must be str, not: 46
2016-11-24 14:29:04 +02:00
Steve Losh
8b63b051a5 Merge pull request #30 from simnalamburt/nvim-support
Neovim support: line buffers shouldn't contain newlines
2016-01-19 14:46:47 +00:00
Hyeon Kim
0d9806d73a Neovim support: line buffers shouldn't contain newlines
The result of `difflib.unified_diff()` may contains newlines at the end of its
each line. It's suppressed in original Vim, but it's illegal in Neovim.

Since there is no good way to prevent `difflib` from appending newlines to the
results, `_output_preview_text()` function should sanitize it.

Thanks @michamos

Reference:
  a5edc5f257/src/nvim/api/buffer.c (L215)
  https://github.com/sjl/gundo.vim/pull/30#issuecomment-170064637
2016-01-11 01:19:22 +09:00
Steve Losh
958803355c Merge. 2015-12-07 15:55:13 +00:00
Omar Khan
d8ea993adc Send strings to difflib.unified_diff
Python 3.5 adds type-checking to difflib, which causes gundo to fail.
This fixes the issue by converting the arguments to strings.
See https://bugs.python.org/issue17445 for details
2015-12-03 10:00:38 +07:00
Jacob Parker
c8f2c67c77 added g:gundo_return_on_revert 2013-08-22 10:56:37 -04:00
Steve Losh
b5a3096211 Merge. 2013-07-10 20:31:53 -04:00
Sergey Alexandrov
64d6d48496 Update inline help message to show real keymaps.
Instead of displaying hardcoded "j/k" for motion between undo states,
real keymaps are fetched from `g:gundo_map_move_older` and
`g:undo_map_move_never` variables.
2013-06-10 17:41:28 +02:00
alvinfrancis
7d8047060d Add g:gundo_playback_delay option
Allow for the option for setting the delay (in milliseconds) to be used
by the GundoPlayTo function in calling vim's sleep command during play
back.
2013-04-15 22:45:52 +08:00
Matthew Bell
e90ec8b55d Fixed an issue with return syntax that breaks in python 2.4 2011-08-27 16:38:43 -07:00
Steve Losh
63ca27fa2a Formatting. 2011-06-28 16:58:00 -04:00
Kien N
52c65f2eb4 Move most of the script to autoload 2011-06-29 03:06:37 +07:00