[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5569424 25/31: Revert "company-clang: Skip over identity p
From: |
Dmitry Gutov |
Subject: |
[elpa] master 5569424 25/31: Revert "company-clang: Skip over identity preprocessor #defines" |
Date: |
Sun, 14 Apr 2019 22:06:20 -0400 (EDT) |
branch: master
commit 55694240cde589423eecb0f6946be4154c99b86f
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Revert "company-clang: Skip over identity preprocessor #defines"
This reverts commit d00bbbac3be99d042024734fc417ecad253a52e4.
Fixes #884.
---
NEWS.md | 3 +++
company-clang.el | 11 +++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 5391bb5..da2d1d2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,9 @@
## Next
+* The change in `company-clang` regarding identity #defines is reverted because
+ it affected other completions as well
+ ([#884](https://github.com/company-mode/company-mode/issues/884)).
* `company-idle-delay` now accepts a function which generates the idle time or
nil indicating no idle completion.
* Add custom variable `company-show-numbers-function` to make numbers of
diff --git a/company-clang.el b/company-clang.el
index d43eebb..962db1e 100644
--- a/company-clang.el
+++ b/company-clang.el
@@ -134,12 +134,11 @@ or automatically through a custom
`company-clang-prefix-guesser'."
(when (string-match ":" match)
(setq match (substring match 0 (match-beginning 0)))))
(let ((meta (match-string-no-properties 2)))
- (unless (equal match meta)
- (when meta
- (put-text-property 0 1 'meta
- (company-clang--strip-formatting meta)
- match))
- (push match lines)))))
+ (when (and meta (not (string= match meta)))
+ (put-text-property 0 1 'meta
+ (company-clang--strip-formatting meta)
+ match)))
+ (push match lines)))
lines))
(defun company-clang--meta (candidate)
- [elpa] master 23136d3 28/31: Update copyright years, (continued)
- [elpa] master 23136d3 28/31: Update copyright years, Dmitry Gutov, 2019/04/14
- [elpa] master 87509b1 19/31: company-complete: Don't change last-command if completion exited, Dmitry Gutov, 2019/04/14
- [elpa] master edbb3c5 16/31: Merge branch 'master' of github.com:company-mode/company-mode, Dmitry Gutov, 2019/04/14
- [elpa] master ebc4fce 17/31: Make company-idle-delay support predicate function, Dmitry Gutov, 2019/04/14
- [elpa] master 20fe015 18/31: Merge pull request #874 from amosbird/master, Dmitry Gutov, 2019/04/14
- [elpa] master f965786 20/31: company-complete: Ensure last command was really the same, Dmitry Gutov, 2019/04/14
- [elpa] master 1974d83 21/31: Make tests resilient to arbitrary text properties in completions, Dmitry Gutov, 2019/04/14
- [elpa] master 2482223 23/31: company-tng: Document post-completion and yasnippet issues, Dmitry Gutov, 2019/04/14
- [elpa] master 668e4b0 22/31: Merge pull request #880 from joaotavora/fix-tests-with-arbitrary-completion-properties, Dmitry Gutov, 2019/04/14
- [elpa] master 5dab70d 26/31: update regex template to match (InBase) declarations, Dmitry Gutov, 2019/04/14
- [elpa] master 5569424 25/31: Revert "company-clang: Skip over identity preprocessor #defines",
Dmitry Gutov <=
- [elpa] master d200fed 29/31: Update NEWS for the latest change, Dmitry Gutov, 2019/04/14
- [elpa] master 3eda0ba 30/31: Release 0.9.10, Dmitry Gutov, 2019/04/14
- [elpa] master 5deda28 31/31: Merge commit '3eda0ba23921d43b733f7975e56d490a34b9f30b' from company, Dmitry Gutov, 2019/04/14