[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 52/52: Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' fr
From: |
Dmitry Gutov |
Subject: |
[elpa] 52/52: Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company |
Date: |
Tue, 01 Jul 2014 11:53:37 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit c828ee6d19b57256e1fa2321dc830fe5a6cf8af1
Merge: 9b6551e 7c14ded
Author: Dmitry Gutov <address@hidden>
Date: Tue Jul 1 14:52:40 2014 +0300
Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company
Conflicts:
packages/company/company-pysmell.el
packages/company/NEWS.md | 16 ++
packages/company/company-capf.el | 4 +-
packages/company/company-clang.el | 20 +-
packages/company/company-css.el | 153 +++++++++++-
packages/company/company-dabbrev-code.el | 31 ++-
packages/company/company-dabbrev.el | 29 ++-
packages/company/company-eclim.el | 6 +-
packages/company/company-etags.el | 6 +-
packages/company/company-files.el | 14 +-
packages/company/company-gtags.el | 57 +++--
packages/company/company-keywords.el | 1 +
packages/company/company-pysmell.el | 4 +-
packages/company/company-semantic.el | 3 +-
packages/company/company-template.el | 3 +-
packages/company/company-tests.el | 63 +++++-
packages/company/company-xcode.el | 3 +-
packages/company/company-yasnippet.el | 5 +-
packages/company/company.el | 377 ++++++++++++++++++------------
18 files changed, 549 insertions(+), 246 deletions(-)
- [elpa] 43/52: company--should-idle-begin: use a more careful check, (continued)
- [elpa] 43/52: company--should-idle-begin: use a more careful check, Dmitry Gutov, 2014/07/01
- [elpa] 42/52: Don't assign to company-point in company-abort and company-finish, Dmitry Gutov, 2014/07/01
- [elpa] 46/52: Never delete the "added newline" twice, Dmitry Gutov, 2014/07/01
- [elpa] 47/52: Don't call post-completion methods and hook in continue-failed case, Dmitry Gutov, 2014/07/01
- [elpa] 45/52: Bring back this-command check when company-idle-delay is t, Dmitry Gutov, 2014/07/01
- [elpa] 40/52: Define company-sort-by-backend-importance, Dmitry Gutov, 2014/07/01
- [elpa] 49/52: company-backends: add better introduction, Dmitry Gutov, 2014/07/01
- [elpa] 48/52: Avoid requiring match is certain circumstances, Dmitry Gutov, 2014/07/01
- [elpa] 35/52: company-css: Add HTML5 tags and more CSS3 properties, Dmitry Gutov, 2014/07/01
- [elpa] 51/52: Release 0.8.1, Dmitry Gutov, 2014/07/01
- [elpa] 52/52: Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company,
Dmitry Gutov <=
- [elpa] 50/52: company-capf.el: Don't ignore things like semantic-capf, Dmitry Gutov, 2014/07/01