[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d00bbba 4/8: company-clang: Skip over identity preprocesso
From: |
Dmitry Gutov |
Subject: |
[elpa] master d00bbba 4/8: company-clang: Skip over identity preprocessor #defines |
Date: |
Wed, 12 Dec 2018 17:46:40 -0500 (EST) |
branch: master
commit d00bbbac3be99d042024734fc417ecad253a52e4
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company-clang: Skip over identity preprocessor #defines
Fixes #841
---
NEWS.md | 5 +++++
company-clang.el | 11 ++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 0d715c6..d2c0ac6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
# History of user-visible changes
+## Next
+
+* `company-clang` removes identity preprocessor #defines from completions
+ ([#841](https://github.com/company-mode/company-mode/issues/841)).
+
## 2018-12-08 (0.9.8)
* CAPF backend fixed to use the right `:exit-function`. It can now safely be a
diff --git a/company-clang.el b/company-clang.el
index 962db1e..d43eebb 100644
--- a/company-clang.el
+++ b/company-clang.el
@@ -134,11 +134,12 @@ 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)))
- (when (and meta (not (string= match meta)))
- (put-text-property 0 1 'meta
- (company-clang--strip-formatting meta)
- match)))
- (push match lines)))
+ (unless (equal match meta)
+ (when meta
+ (put-text-property 0 1 'meta
+ (company-clang--strip-formatting meta)
+ match))
+ (push match lines)))))
lines))
(defun company-clang--meta (candidate)
- [elpa] master updated (a61b7e3 -> d461e05), Dmitry Gutov, 2018/12/12
- [elpa] master 388eec5 1/8: Bind inhibit-quit to nil inside an idle timer, Dmitry Gutov, 2018/12/12
- [elpa] master b4a8690 3/8: Reindent, Dmitry Gutov, 2018/12/12
- [elpa] master 8407ff3 6/8: Add the new entries, Dmitry Gutov, 2018/12/12
- [elpa] master d461e05 8/8: Merge commit 'ac82e875e144b227e926c09c53def9b0c059115c' from company, Dmitry Gutov, 2018/12/12
- [elpa] master ac82e87 7/8: Release 0.9.9, Dmitry Gutov, 2018/12/12
- [elpa] master aabf0a3 5/8: Fix the exit-function fix, Dmitry Gutov, 2018/12/12
- [elpa] master c18bd7e 2/8: #845 Make a longer NEWS entry, Dmitry Gutov, 2018/12/12
- [elpa] master d00bbba 4/8: company-clang: Skip over identity preprocessor #defines,
Dmitry Gutov <=