From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 2 Feb 2015 15:15:35 +0000 (+0200)
Subject: Pass company-lighter-base to company--group-lighter explicitly
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/6fcbcfada78170de6c9ac1db7a2fc0ca9b34fb1a?hp=94f24594cfbf7a7e2f96e04fb423bf9f8354e9d3

Pass company-lighter-base to company--group-lighter explicitly
---

diff --git a/company.el b/company.el
index 991ab9bc4..8ee3227d9 100644
--- a/company.el
+++ b/company.el
@@ -671,9 +671,9 @@ asynchronous call into synchronous.")
                           (company-backend
                            (:eval
                             (if (consp company-backend)
-                                (company--group-lighter
-                                 (nth company-selection
-                                      company-candidates))
+                                (company--group-lighter (nth company-selection
+                                                             company-candidates)
+                                                        company-lighter-base)
                               (symbol-name company-backend)))
                            company-lighter-base))
   "Mode line lighter for Company.
@@ -1066,13 +1066,13 @@ can retrieve meta-data for them."
           company-selection-changed t)
     (company-call-frontends 'update)))
 
-(defun company--group-lighter (candidate)
+(defun company--group-lighter (candidate base)
   (let ((backend (or (get-text-property 0 'company-backend candidate)
                      (car company-backend))))
     (when (and backend (symbolp backend))
       (let ((name (replace-regexp-in-string "company-\\|-company" ""
                                             (symbol-name backend))))
-        (format "%s-<%s>" company-lighter-base name)))))
+        (format "%s-<%s>" base name)))))
 
 (defun company-update-candidates (candidates)
   (setq company-candidates-length (length candidates))