diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 4776696..7fb5d50 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -61,7 +61,7 @@ endfunction
 " func_def
 " ------------------------------------------------------------------------
 function jedi#show_func_def()
-  python << PYTHONEOF
+python << PYTHONEOF
 if 1:
     try:
         show_func_def(get_script().get_in_function_call())
@@ -321,10 +321,5 @@ endfunc
 
 function! jedi#configure_function_definition()
     autocmd InsertLeave <buffer> call jedi#clear_func_def()
-
-    " , and () mappings
-    inoremap <buffer> ( (<C-R>=jedi#show_func_def()<CR>
-    inoremap <buffer> ) )<C-R>=jedi#show_func_def()<CR>
-    inoremap <buffer> , ,<C-R>=jedi#show_func_def()<CR>
-    inoremap <buffer> <BS> <BS><C-R>=jedi#show_func_def()<CR>
+    autocmd CursorMovedI <buffer> call jedi#show_func_def()
 endfunction
diff --git a/jedi b/jedi
index ff84e46..1009a0b 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit ff84e4670b1622a9af0a090b1a906ac497c91d9e
+Subproject commit 1009a0b3764a3913d5c875e964731040bc7ff063