[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6fcbcfa 08/10: Pass company-lighter-base to company--group
From: |
Dmitry Gutov |
Subject: |
[elpa] master 6fcbcfa 08/10: Pass company-lighter-base to company--group-lighter explicitly |
Date: |
Mon, 02 Feb 2015 15:23:10 +0000 |
branch: master
commit 6fcbcfada78170de6c9ac1db7a2fc0ca9b34fb1a
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Pass company-lighter-base to company--group-lighter explicitly
---
company.el | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/company.el b/company.el
index 991ab9b..8ee3227 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))
- [elpa] master updated (089d51a -> c5538df), Dmitry Gutov, 2015/02/02
- [elpa] master a015fb3 09/10: Bump the version, Dmitry Gutov, 2015/02/02
- [elpa] master 08ec4cd 03/10: Add a comment, Dmitry Gutov, 2015/02/02
- [elpa] master bb8aa8b 04/10: company-search-map: Include <up> and <down> bindings, Dmitry Gutov, 2015/02/02
- [elpa] master 1b0dc62 06/10: company-search-map: Add company-complete-number bindings, Dmitry Gutov, 2015/02/02
- [elpa] master 10a7750 05/10: Track the current selection better, Dmitry Gutov, 2015/02/02
- [elpa] master b2de6ad 02/10: Fix version, Dmitry Gutov, 2015/02/02
- [elpa] master 94f2459 07/10: Use mode-line format in company-lighter, Dmitry Gutov, 2015/02/02
- [elpa] master 6fcbcfa 08/10: Pass company-lighter-base to company--group-lighter explicitly,
Dmitry Gutov <=
- [elpa] master 3716acb 01/10: Enable company-search-map in company-search-mode body, Dmitry Gutov, 2015/02/02
- [elpa] master c5538df 10/10: Merge commit 'a015fb350abe50d250e3e7a9c3c762397326977f' from company, Dmitry Gutov, 2015/02/02