Merge pull request #257 from tkf/improve-tooltip-for-company

Don't show jedi tooltip when company tooltip is enabled
tkf · Dec 14, 2015 · 11b9886 · 11b9886
2 parents f486fd1 + adb40a5
commit 11b9886
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/jedi-core.el b/jedi-core.el
@@ -633,8 +633,9 @@ See: https://github.com/tkf/emacs-jedi/issues/54"
       (concat call_name "(" (mapconcat #'identity params ", ") ")"))))
 
 (defun jedi:get-in-function-call--tooltip-show (args)
-  (when (and args (or (not (boundp 'auto-complete-mode))
-                      (and (boundp 'ac-completing) (not ac-completing))))
+  (when (and args (or (and (boundp 'ac-completing) (not ac-completing))
+                      (and (boundp 'company-pseudo-tooltip-overlay)
+                           (not company-pseudo-tooltip-overlay))))
     (jedi:tooltip-show
      (apply #'jedi:get-in-function-call--construct-call-signature args))))