[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 24bbc85 35/66: Fix #809 by looking up `face' as well
From: |
Dmitry Gutov |
Subject: |
[elpa] master 24bbc85 35/66: Fix #809 by looking up `face' as well |
Date: |
Mon, 5 Nov 2018 18:19:18 -0500 (EST) |
branch: master
commit 24bbc85080332c613fbb390af08ff3b76c011b13
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Fix #809 by looking up `face' as well
---
company-capf.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/company-capf.el b/company-capf.el
index 7e76dfc..409687b 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -123,7 +123,9 @@
(while (< pos limit)
(setq pos
(if (< pos 0) 0 (next-property-change pos arg limit)))
- (setq prop-value (get-text-property pos 'font-lock-face arg)
+ (setq prop-value (or
+ (get-text-property pos 'face arg)
+ (get-text-property pos 'font-lock-face arg))
faces (if (listp prop-value) prop-value (list prop-value))
has-face-p (memq 'completions-common-part faces))
(cond ((and (not match-start) has-face-p)
- [elpa] master ed8bf2a 56/66: capitalize the comment sentences, (continued)
- [elpa] master ed8bf2a 56/66: capitalize the comment sentences, Dmitry Gutov, 2018/11/05
- [elpa] master c95a6b4 65/66: Release 0.9.7, Dmitry Gutov, 2018/11/05
- [elpa] master 1e22493 66/66: Merge commit 'c95a6b41d621de4253b77e512aa61fc0e75acddc' from company, Dmitry Gutov, 2018/11/05
- [elpa] master ffba418 26/66: Merge pull request #802 from wyuenho/update-keywords, Dmitry Gutov, 2018/11/05
- [elpa] master 5ab7f42 64/66: Merge pull request #838 from bet4it/restore-point, Dmitry Gutov, 2018/11/05
- [elpa] master f31d284 33/66: Mention #798 in NEWS.md, Dmitry Gutov, 2018/11/05
- [elpa] master d0fab46 36/66: Properly fix #809, Dmitry Gutov, 2018/11/05
- [elpa] master 7e20ee4 43/66: update go-mode's keywords sort, Dmitry Gutov, 2018/11/05
- [elpa] master 2bcaa2e 55/66: add some refs, Dmitry Gutov, 2018/11/05
- [elpa] master afbaad1 62/66: company-ispell-available: Better error message, Dmitry Gutov, 2018/11/05
- [elpa] master 24bbc85 35/66: Fix #809 by looking up `face' as well,
Dmitry Gutov <=
- [elpa] master 1f836b6 37/66: Merge pull request #810 from joaotavora/master, Dmitry Gutov, 2018/11/05
- [elpa] master 3162aa2 47/66: Update company-keywords.el, Dmitry Gutov, 2018/11/05
- [elpa] master b423ba4 48/66: Merge pull request #819 from chunzhouyu/master, Dmitry Gutov, 2018/11/05
- [elpa] master a163e94 49/66: Improve comment, Dmitry Gutov, 2018/11/05
- [elpa] master 44ed412 54/66: resort go-mode'e keywords, Dmitry Gutov, 2018/11/05