[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 25/30: Handle nil company-common, in order not to bind it in test
|
From: |
Dmitry Gutov |
|
Subject: |
[elpa] 25/30: Handle nil company-common, in order not to bind it in tests |
|
Date: |
Tue, 14 Oct 2014 22:22:54 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit bec2600d4d77a06a2df0108a26c0ed3a2e1e226d
Author: Dmitry Gutov <address@hidden>
Date: Wed Oct 8 08:23:32 2014 +0400
Handle nil company-common, in order not to bind it in tests
---
company.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/company.el b/company.el
index e607bed..dd4d7ea 100644
--- a/company.el
+++ b/company.el
@@ -2091,7 +2091,9 @@ If SHOW-VERSION is non-nil, show the version in the echo
area."
(defun company-fill-propertize (value annotation width selected left right)
(let* ((margin (length left))
(common (or (company-call-backend 'match value)
- (string-width company-common)))
+ (if company-common
+ (string-width company-common)
+ 0)))
(ann-ralign company-tooltip-align-annotations)
(value (company--clean-string value))
(ann-truncate (< width
- [elpa] 15/30: company-files: Fix cache behavior for when we're backspacing, (continued)
- [elpa] 15/30: company-files: Fix cache behavior for when we're backspacing, Dmitry Gutov, 2014/10/14
- [elpa] 16/30: company-file--keys-match-p: Handle OLD being nil, Dmitry Gutov, 2014/10/14
- [elpa] 17/30: company-begin-commands: Add `orgtbl-self-insert-command', Dmitry Gutov, 2014/10/14
- [elpa] 19/30: company-clang-arguments: Fix default element value, Dmitry Gutov, 2014/10/14
- [elpa] 21/30: company-call-backend-raw: Use `condition-case-unless-debug', too, Dmitry Gutov, 2014/10/14
- [elpa] 20/30: Handle non-printable and multiple-width chars in completions, Dmitry Gutov, 2014/10/14
- [elpa] 18/30: Use `condition-case-unless-debug' more, Dmitry Gutov, 2014/10/14
- [elpa] 22/30: company-dabbrev--search: Ignore "uninteresting" buffers, Dmitry Gutov, 2014/10/14
- [elpa] 23/30: Make new tests and interactive-only, Dmitry Gutov, 2014/10/14
- [elpa] 24/30: company-fill-propertize: Use `string-width' on `company-common', Dmitry Gutov, 2014/10/14
- [elpa] 25/30: Handle nil company-common, in order not to bind it in tests,
Dmitry Gutov <=
- [elpa] 12/30: Update NEWS; do the forgotten version bump, Dmitry Gutov, 2014/10/14
- [elpa] 14/30: company-files.el: Use the "private function" naming convention, Dmitry Gutov, 2014/10/14
- [elpa] 26/30: Call `bbdb-search' inside `eval' block, Dmitry Gutov, 2014/10/14
- [elpa] 27/30: Extract regexp for buffers to ignore into a new var, Dmitry Gutov, 2014/10/14
- [elpa] 28/30: company-template-c-like-templatify: Support generics, Dmitry Gutov, 2014/10/14
- [elpa] 29/30: Bump the version, Dmitry Gutov, 2014/10/14
- [elpa] 30/30: Merge commit '60d4c09c982a1c562a70cd6aa705f47ab3badcfb' from company, Dmitry Gutov, 2014/10/14