[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ELPA-diffs] [elpa] 12/12: Merge commit '8dc8f9525714db66f659a2a51322345
|
From: |
Dmitry Gutov |
|
Subject: |
[ELPA-diffs] [elpa] 12/12: Merge commit '8dc8f9525714db66f659a2a51322345068764bd3' from company |
|
Date: |
Sat, 25 Jan 2014 11:35:50 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit c87035c021a9be74f8420936c4c5043f417c02c2
Merge: 324e000 8dc8f95
Author: Dmitry Gutov <address@hidden>
Date: Sat Jan 25 13:34:56 2014 +0200
Merge commit '8dc8f9525714db66f659a2a51322345068764bd3' from company
Conflicts:
packages/company/company-capf.el
packages/company/NEWS.md | 7 ++
packages/company/company-capf.el | 2 +-
packages/company/company-tests.el | 20 +++-
packages/company/company.el | 186 ++++++++++++++++++++++++++++---------
4 files changed, 166 insertions(+), 49 deletions(-)
- [ELPA-diffs] [elpa] 03/12: company--numbered-line: span tooltip face to the margins, (continued)
- [ELPA-diffs] [elpa] 03/12: company--numbered-line: span tooltip face to the margins, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 01/12: Fix #49, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 08/12: company--create-lines: Clear the old offset when appropriate, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 07/12: company--create-lines: only reserve width for numbers when they'll be displayed, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 04/12: {cutoff, offset}, {numbered, position}-line, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 09/12: * company-capf.el (company--capf-data): Don't get confused by lambda exps., Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 10/12: Release 0.6.14, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 11/12: Remove leftover message statement, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 02/12: Render the popup with margins, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 05/12: Render scrollbar on the side of the tooltip, Dmitry Gutov, 2014/01/25
- [ELPA-diffs] [elpa] 12/12: Merge commit '8dc8f9525714db66f659a2a51322345068764bd3' from company,
Dmitry Gutov <=