From 6ee05f976d7261a9d44a08aacdb3a3a522ba3c15 Mon Sep 17 00:00:00 2001 From: David Halter Date: Tue, 20 Aug 2013 15:13:55 +0430 Subject: [PATCH] use call_signature_escape instead of the old function_definition_escape, to be compatible with jedi --- plugin/jedi.vim | 2 +- plugin/jedi_vim.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/jedi.vim b/plugin/jedi.vim index d7694f3..0e44137 100644 --- a/plugin/jedi.vim +++ b/plugin/jedi.vim @@ -32,7 +32,7 @@ let s:settings = { \ 'popup_on_dot': 1, \ 'pydoc': "'K'", \ 'show_function_definition': 1, - \ 'function_definition_escape': "'≡'", + \ 'call_signature_escape': "'≡'", \ 'auto_close_doc': 1, \ 'popup_select_first': 1, \ 'quickfix_window_height': 10 diff --git a/plugin/jedi_vim.py b/plugin/jedi_vim.py index 6784dda..6c471fb 100644 --- a/plugin/jedi_vim.py +++ b/plugin/jedi_vim.py @@ -185,7 +185,7 @@ def show_pydoc(): def clear_call_signatures(): cursor = vim.current.window.cursor - e = vim.eval('g:jedi#function_definition_escape') + e = vim.eval('g:jedi#call_signature_escape') regex = r'%sjedi=([0-9]+), ([^%s]*)%s.*%sjedi%s'.replace('%s', e) for i, line in enumerate(vim.current.buffer): match = re.search(r'%s' % regex, line) @@ -238,7 +238,7 @@ def show_call_signatures(call_def=None, completion_lines=0): # Need to decode it with utf8, because vim returns always a python 2 # string even if it is unicode. - e = vim.eval('g:jedi#function_definition_escape') + e = vim.eval('g:jedi#call_signature_escape') if hasattr(e, 'decode'): e = e.decode('UTF-8') # replace line before with cursor