[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 10ebfae 3/3: Merge commit '906d8137224c1a5bd1dc913940e0d32
From: |
Ingo Lohmar |
Subject: |
[elpa] master 10ebfae 3/3: Merge commit '906d8137224c1a5bd1dc913940e0d32ffecf5523' from company-statistics |
Date: |
Thu, 26 Nov 2015 20:58:13 +0000 |
branch: master
commit 10ebfae3a4fb137647cf94d59f52ef2967cfc32e
Merge: 7e76d09 906d813
Author: Ingo Lohmar <address@hidden>
Commit: Ingo Lohmar <address@hidden>
Merge commit '906d8137224c1a5bd1dc913940e0d32ffecf5523' from
company-statistics
* commit '906d8137224c1a5bd1dc913940e0d32ffecf5523':
Bump version
Fix --last-keyword
---
packages/company-statistics/company-statistics.el | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/packages/company-statistics/company-statistics.el
b/packages/company-statistics/company-statistics.el
index b982c48..62c3c1d 100644
--- a/packages/company-statistics/company-statistics.el
+++ b/packages/company-statistics/company-statistics.el
@@ -4,7 +4,7 @@
;; Author: Ingo Lohmar <address@hidden>
;; URL: https://github.com/company-mode/company-statistics
-;; Version: 0.2.1
+;; Version: 0.2.2
;; Keywords: abbrev, convenience, matching
;; Package-Requires: ((emacs "24.3") (company "0.8.5"))
@@ -184,12 +184,14 @@ number)."
font-lock-keyword-face up to point, or nil."
(let ((face-pos (point)))
(while (and (number-or-marker-p face-pos)
- (< 1 face-pos)
+ (< (point-min) face-pos)
(not (eq (get-text-property (1- face-pos) 'face)
'font-lock-keyword-face)))
(setq face-pos
(previous-single-property-change face-pos 'face nil (point-min))))
- (when (and (number-or-marker-p face-pos)) ;else eval to nil
+ (when (and (number-or-marker-p face-pos)
+ (eq (get-text-property (max (point-min) (1- face-pos)) 'face)
+ 'font-lock-keyword-face))
(list :keyword
(buffer-substring-no-properties
(previous-single-property-change face-pos 'face nil (point-min))