diff --git a/jedi b/jedi
index 75c4ed3..7b8988e 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit 75c4ed30ee3f6856a3abf59d792f68cdb9a2c25c
+Subproject commit 7b8988ebff6da2ec5f64c0a35281652eaef239db
diff --git a/plugin/jedi_vim.py b/plugin/jedi_vim.py
index b1b40d1..adb8f2b 100644
--- a/plugin/jedi_vim.py
+++ b/plugin/jedi_vim.py
@@ -163,7 +163,7 @@ def clear_func_def():
 
 
 def show_func_def(call_def=None, completion_lines=0):
-    if vim.eval("has('conceal')") == '0':
+    if vim.eval("has('conceal') && g:jedi#show_function_definition") == '0':
         return
     try:
         if call_def == None: