Merge commit '7be4321260f0c73ef4c3cadc646f6bb496650253' from company

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

diff --git a/packages/company/company-semantic.el b/packages/company/company-semantic.el
index 796cc9ec08aab217182ccf12502a7972d343791e..372a6f6c9e60ba93f007043568a3489b4d87a433 100644 (file)
--- a/packages/company/company-semantic.el
+++ b/packages/company/company-semantic.el
@@ -51,20 +51,26 @@
 
 (defvar company-semantic--current-tags nil
   "Tags for the current context.")
+(make-variable-buffer-local 'company-semantic--current-tags)
+
+(defun company-semantic-documentation-for-tag (tag)
+  (when (semantic-tag-buffer tag)
+    ;; When TAG's buffer is unknown, the function below raises an error.
+    (semantic-documentation-for-tag tag)))
 
 (defun company-semantic-doc-or-summary (tag)
-  (or (semantic-documentation-for-tag tag)
+  (or (company-semantic-documentation-for-tag tag)
       (and (require 'semantic-idle nil t)
            (require 'semantic/idle nil t)
            (funcall semantic-idle-summary-function tag nil t))))
 
 (defun company-semantic-summary-and-doc (tag)
-  (let ((doc (semantic-documentation-for-tag tag))
+  (let ((doc (company-semantic-documentation-for-tag tag))
         (summary (funcall semantic-idle-summary-function tag nil t)))
     (and (stringp doc)
          (string-match "\n*\\(.*\\)$" doc)
          (setq doc (match-string 1 doc)))
-    (concat (funcall semantic-idle-summary-function tag nil t)
+    (concat summary
             (when doc
                   (if (< (+ (length doc) (length summary) 4) (window-width))
                       " -- "
@@ -72,7 +78,7 @@
             doc)))
 
 (defun company-semantic-doc-buffer (tag)
-  (let ((doc (semantic-documentation-for-tag tag)))
+  (let ((doc (company-semantic-documentation-for-tag tag)))
     (when doc
       (company-doc-buffer
        (concat (funcall semantic-idle-summary-function tag nil t)