[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 09/14: company-capf common-part: look up font-lock-face
From: |
Dmitry Gutov |
Subject: |
[elpa] 09/14: company-capf common-part: look up font-lock-face |
Date: |
Tue, 18 Feb 2014 05:51:02 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit a63952fd2dbe6b5cf58013c868caaba26dc34532
Author: Dmitry Gutov <address@hidden>
Date: Mon Feb 17 06:58:16 2014 +0200
company-capf common-part: look up font-lock-face
Because completion-pcm--hilit-commonality uses it.
---
company-capf.el | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/company-capf.el b/company-capf.el
index f1b46d9..d31f32d 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -79,16 +79,16 @@ Requires Emacs 24.1 or newer."
(cdr (assq 'display-sort-function meta))))))
(`common-part
;; Can't just use 0 when base-size (see above) is non-zero.
- (let ((start (if (get-text-property 0 'face arg)
+ (let ((start (if (get-text-property 0 'font-lock-face arg)
0
- (next-single-property-change 0 'face arg))))
+ (next-single-property-change 0 'font-lock-face arg))))
(when start
;; completions-common-part comes first, but we can't just look for
this
;; value because it can be in a list.
(or
- (let ((value (get-text-property start 'face arg)))
+ (let ((value (get-text-property start 'font-lock-face arg)))
(text-property-not-all start (length arg)
- 'face value arg))
+ 'font-lock-face value arg))
(length arg)))))
(`duplicates t)
(`no-cache t) ;Not much can be done here, as long as we handle
- [elpa] branch master updated (2e6b4f6 -> cae1efc), Dmitry Gutov, 2014/02/18
- [elpa] 04/14: Fix scrolling up from the last item, Dmitry Gutov, 2014/02/18
- [elpa] 06/14: Introduce company-dabbrev-downcase, Dmitry Gutov, 2014/02/18
- [elpa] 01/14: Set company-added-newline to t if the buffer was modified, Dmitry Gutov, 2014/02/18
- [elpa] 02/14: Don't `company-cancel' twice, Dmitry Gutov, 2014/02/18
- [elpa] 05/14: Fix out-of-bounds error on truncated anno fontification, Dmitry Gutov, 2014/02/18
- [elpa] 07/14: company-capf: fix when company-point is nil, Dmitry Gutov, 2014/02/18
- [elpa] 03/14: New user option, company-continue-commands, Dmitry Gutov, 2014/02/18
- [elpa] 08/14: company--capf-data: Check that the cdr is cons, not data itself, Dmitry Gutov, 2014/02/18
- [elpa] 09/14: company-capf common-part: look up font-lock-face,
Dmitry Gutov <=
- [elpa] 10/14: company-capf: cache the capf data, Dmitry Gutov, 2014/02/18
- [elpa] 14/14: Merge commit '119822078ee3024c2d27017d45ef4578fa36040f' from company, Dmitry Gutov, 2014/02/18
- [elpa] 12/14: company-continue-commands: change the default value, Dmitry Gutov, 2014/02/18
- [elpa] 13/14: Bump the version, Dmitry Gutov, 2014/02/18
- [elpa] 11/14: common-part: rename to `match' and document, Dmitry Gutov, 2014/02/18