Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company

[gnu-emacs-elpa] / packages / company / company-yasnippet.el

diff --git a/packages/company/company-yasnippet.el b/packages/company/company-yasnippet.el
index 4730b211b7989e09d2639155a511b1154d79ccf6..741a160086707a5ed25c4681a63f0c7bd4488c02 100644 (file)
--- a/packages/company/company-yasnippet.el
+++ b/packages/company/company-yasnippet.el
@@ -82,7 +82,10 @@ shadow back-ends that come after it.  Recommended usages:
      ;; How many trigger keys start with non-symbol characters anyway?
      (and yas-minor-mode
           (company-grab-symbol)))
-    (annotation (concat " -> " (get-text-property 0 'yas-annotation arg)))
+    (annotation
+     (concat
+      (unless company-tooltip-align-annotations " -> ")
+      (get-text-property 0 'yas-annotation arg)))
     (candidates (company-yasnippet--candidates arg))
     (post-completion
      (let ((template (get-text-property 0 'yas-template arg)))