vim/gundo.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Steve Losh 2015-12-07 15:55:13 +00:00
commit 958803355c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/gundo.py
View File

@ -361,7 +361,7 @@ def _generate_preview_diff(current, node_before, node_after):
before_name = 'Original' before_name = 'Original'
before_time = '' before_time = ''
after_name = node_after.n after_name = str(node_after.n)
after_time = _fmt_time(node_after.time) after_time = _fmt_time(node_after.time)
else: else:
_undo_to(node_before.n) _undo_to(node_before.n)
@ -370,9 +370,9 @@ def _generate_preview_diff(current, node_before, node_after):
_undo_to(node_after.n) _undo_to(node_after.n)
after_lines = vim.current.buffer[:] after_lines = vim.current.buffer[:]
before_name = node_before.n before_name = str(node_before.n)
before_time = _fmt_time(node_before.time) 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) after_time = _fmt_time(node_after.time)
_undo_to(current) _undo_to(current)
@ -390,9 +390,9 @@ def _generate_change_preview_diff(current, node_before, node_after):
_undo_to(node_after.n) _undo_to(node_after.n)
after_lines = vim.current.buffer[:] 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 '' 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 '' after_time = node_after.time and _fmt_time(node_after.time) or ''
_undo_to(current) _undo_to(current)

4
autoload/gundo.vim
View File

@ -283,10 +283,10 @@ endfunction"}}}
function! s:GundoOpen()"{{{ function! s:GundoOpen()"{{{
if !exists('g:gundo_py_loaded') if !exists('g:gundo_py_loaded')
if s:has_supported_python == 2 && g:gundo_prefer_python3 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() python3 initPythonModule()
else else
exe 'pyfile ' . s:plugin_path . '/gundo.py' exe 'pyfile ' . escape(s:plugin_path, ' ') . '/gundo.py'
python initPythonModule() python initPythonModule()
endif endif