[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 03/52: company-clang: don't mistake scoping operator for objc arg
From: |
Dmitry Gutov |
Subject: |
[elpa] 03/52: company-clang: don't mistake scoping operator for objc args |
Date: |
Tue, 01 Jul 2014 11:53:04 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit 43283ba0be1246b3eb60de65c7c0ce6e7d078d28
Author: Dmitry Gutov <address@hidden>
Date: Mon Apr 28 14:05:35 2014 +0400
company-clang: don't mistake scoping operator for objc args
---
company-clang.el | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/company-clang.el b/company-clang.el
index 4f0f318..1ddb7ca 100644
--- a/company-clang.el
+++ b/company-clang.el
@@ -145,7 +145,7 @@ or automatically through a custom
`company-clang-prefix-guesser'."
(let ((meta (company-clang--meta candidate)))
(cond
((null meta) nil)
- ((string-match ":" meta)
+ ((string-match "[^:]:[^:]" meta)
(substring meta (match-beginning 0)))
((string-match "\\((.*)\\'\\)" meta)
(match-string 1 meta)))))
@@ -316,9 +316,9 @@ passed via standard input."
(post-completion (let ((anno (company-clang--annotation arg)))
(when (and company-clang-insert-arguments anno)
(insert anno)
- (if (string-match ":" anno)
+ (if (string-match "[^:]:[^:]" anno)
(company-clang-objc-templatify anno)
- (company-template-c-like-templatify anno)))))))
+ (company-template-c-like-templatify anno)))))))
(provide 'company-clang)
;;; company-clang.el ends here
- [elpa] 12/52: company-clang--annotation: include method qualifiers in the annotation, (continued)
- [elpa] 12/52: company-clang--annotation: include method qualifiers in the annotation, Dmitry Gutov, 2014/07/01
- [elpa] 13/52: NEWS: document the change in clang invocation, Dmitry Gutov, 2014/07/01
- [elpa] 14/52: company--continue: don't pass the new prefix to `company-cancel', Dmitry Gutov, 2014/07/01
- [elpa] 15/52: company-files-complete: move files in subdirs to the end, Dmitry Gutov, 2014/07/01
- [elpa] 16/52: Introduce company-tooltip-flip-when-above, Dmitry Gutov, 2014/07/01
- [elpa] 17/52: Fix typo, Dmitry Gutov, 2014/07/01
- [elpa] 18/52: extended gtags functionality #90 showing annotations and meta, Dmitry Gutov, 2014/07/01
- [elpa] 21/52: Merge pull request #126 from ksjogo/gtags, Dmitry Gutov, 2014/07/01
- [elpa] 19/52: fixing let in gtags annotation, Dmitry Gutov, 2014/07/01
- [elpa] 20/52: Add new possible value to `company-dabbrev-code-other-buffers', Dmitry Gutov, 2014/07/01
- [elpa] 03/52: company-clang: don't mistake scoping operator for objc args,
Dmitry Gutov <=
- [elpa] 24/52: Merge pull request #127 from bbatsov/doc-fixes, Dmitry Gutov, 2014/07/01
- [elpa] 23/52: Small fixes, Dmitry Gutov, 2014/07/01
- [elpa] 25/52: Some indentation fixes, Dmitry Gutov, 2014/07/01
- [elpa] 27/52: Merge pull request #128 from bbatsov/defvar-local, Dmitry Gutov, 2014/07/01
- [elpa] 30/52: Merge pull request #129 from bbatsov/c-h, Dmitry Gutov, 2014/07/01
- [elpa] 22/52: Update NEWS, Dmitry Gutov, 2014/07/01
- [elpa] 26/52: Backport defvar-local from Emacs 24.2, Dmitry Gutov, 2014/07/01
- [elpa] 28/52: Add package-version property to vars after in 0.7.0, Dmitry Gutov, 2014/07/01
- [elpa] 29/52: Bind company-show-doc-buffer to C-h, Dmitry Gutov, 2014/07/01
- [elpa] 31/52: company-css-value-classes: fix border-width infloop, Dmitry Gutov, 2014/07/01