[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/company 38d7542 3/6: company-text-icons-margin: Swap or
From: |
ELPA Syncer |
Subject: |
[elpa] externals/company 38d7542 3/6: company-text-icons-margin: Swap order of BG cons |
Date: |
Wed, 5 May 2021 15:57:08 -0400 (EDT) |
branch: externals/company
commit 38d7542283efbc1c254f9689da37184d45e360dc
Author: Mohsin Kaleem <mohkale@kisara.moe>
Commit: Mohsin Kaleem <mohkale@kisara.moe>
company-text-icons-margin: Swap order of BG cons
BG-WHEN-SELECTED is the cdr, regular item BG is the car.
---
company.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/company.el b/company.el
index 83003e8..e80afb2 100644
--- a/company.el
+++ b/company.el
@@ -1515,7 +1515,7 @@ The format should be an alist of (KIND . CONF) where CONF
is a list of the
form (ICON FG BG) which is used to propertize the icon to be shown for a
candidate of kind KIND. FG can either be color string or a face from which
we can get a color string (using the :foreground face-property). BG must be
-of the same form as FG or a cons cell of (BG-WHEN-SELECTED . BG) which each
+of the same form as FG or a cons cell of (BG . BG-WHEN-SELECTED) which each
should be of the same form as FG.
The only mandatory element in CONF is ICON, you can omit both the FG and BG
@@ -1559,8 +1559,8 @@ See `company-text-icons-mapping'."
(defun company-text-icons--face (fg bg selected)
;; Narrow to specific bg used for current candidate when a CONS cell.
(when (consp bg)
- (setq bg (if selected (car bg) (cdr bg))))
- (let ((bg-color (if (facep bg) (face-attribute bg :foreground) bg))
+ (setq bg (if selected (cdr bg) (car bg))))
+ (let ((bg-color (if (facep bg) (face-attribute bg :background) bg))
(fg-color (if (facep fg) (face-attribute fg :foreground) fg)))
`(,@company-text-face-extra-attributes
,@(cond
- [elpa] externals/company updated (9074b71 -> b1b51b5), ELPA Syncer, 2021/05/05
- [elpa] externals/company 38d7542 3/6: company-text-icons-margin: Swap order of BG cons,
ELPA Syncer <=
- [elpa] externals/company 3d7110b 1/6: company-text-icons-mapping: Merge faces/colors into format, ELPA Syncer, 2021/05/05
- [elpa] externals/company 1657962 2/6: company-text-icons-mapping: Allow either FG/BG to be face or string, ELPA Syncer, 2021/05/05
- [elpa] externals/company 15bd239 4/6: company-text-icons-margin: Always adjust bg on select, ELPA Syncer, 2021/05/05
- [elpa] externals/company b1b51b5 6/6: Merge pull request #1099 from mohkale/color-text-icons, ELPA Syncer, 2021/05/05
- [elpa] externals/company 59bbbbc 5/6: company-text-icons-margin: Better handling of unspecified colors, ELPA Syncer, 2021/05/05