[elpa] 05/21: company-sort-by-occurrence: handle cons prefixes

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit db1a7ada2b812e3e7ff2be651b6bc2a44e4afba2
Author: Dmitry Gutov <address@hidden>
Date:   Thu Jan 30 19:13:14 2014 +0200

    company-sort-by-occurrence: handle cons prefixes
---
 company.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/company.el b/company.el
index cb46efa..307929e 100644
--- a/company.el
+++ b/company.el
@@ -945,7 +945,8 @@ point. The rest of the list is appended unchanged."
                          (and (not (memq (get-text-property (point) 'face)
                                          '(font-lock-function-name-face
                                            font-lock-keyword-face)))
-                              (let ((prefix (company-call-backend 'prefix)))
+                              (let* ((prefix (company-call-backend 'prefix))
+                                     (prefix (or (car-safe prefix) prefix)))
                                 (and (stringp prefix)
                                      (= (length prefix) (- end beg))))))
                    (push (cons candidate (if (< beg (point))