]> code.delx.au - gnu-emacs-elpa/commitdiff
company-clang post-completion: early abort when ObjC and no ":"
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 10 Apr 2013 00:59:39 +0000 (04:59 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 10 Apr 2013 00:59:39 +0000 (04:59 +0400)
company-clang.el

index 8b0770d033185390bc3e9732543957ba0dab6d97..c8cfc61ac42bbdfdd77568f3fb8819dd8f9231da 100644 (file)
@@ -256,11 +256,10 @@ Completions only work correctly when the buffer has been saved.
     (crop (and (string-match ":\\|(" arg)
                (substring arg 0 (match-beginning 0))))
     (post-completion (cond
-                      ((derived-mode-p 'objc-mode)
-                       (string-match ":" arg)
-                       (company-clang-objc-templatify arg))
-                      (t
-                       (company-template-c-like-templatify arg))))))
+                      ((not (derived-mode-p 'objc-mode))
+                       (company-template-c-like-templatify arg))
+                      ((string-match ":" arg)
+                       (company-clang-objc-templatify arg))))))
 
 (provide 'company-clang)
 ;;; company-clang.el ends here