Changed wrong Xcode types.

[gnu-emacs-elpa] / company-xcode.el

diff --git a/company-xcode.el b/company-xcode.el
index 8e068ade17edc048a54a78cdc78f8ee368d47cdf..ac3f4cc87b8ca548c9b61b03dd9bc786deb0efcf 100644 (file)
--- a/company-xcode.el
+++ b/company-xcode.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2009 Nikolaj Schumacher
 ;;
-;; This file is part of company 0.3.
+;; This file is part of company 0.3.1.
 ;;
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
   (setq company-xcode-tags nil))
 
 (defcustom company-xcode-types
-  '("Class" "Const" "Constant" "Enum" "Macro" "Modeled Class" "Structure"
+  '("Class" "Constant" "Enum" "Macro" "Modeled Class" "Structure"
     "Type" "Union" "Function")
   "*The types of symbols offered by `company-xcode'
 No context-enabled completion is available.  Types like methods will be
@@ -44,8 +44,8 @@ valid in most contexts."
          (company-xcode-reset))
   :group 'company-xcode
   :type '(set (const "Category") (const "Class") (const "Class Method")
-              (const "Const") (const "Constant") (const "Enum") (const "Field")
-              (const "Instance Method") (const "Instance Variables")
+              (const "Constant") (const "Enum") (const "Field")
+              (const "Instance Method") (const "Instance Variable")
               (const "Macro") (const "Modeled Class") (const "Modeled Method")
               (const "Property") (const "Protocol") (const "Structure")
               (const "Type") (const "Union") (const "Variable")
@@ -100,9 +100,9 @@ valid in most contexts."
     ('interactive (company-begin-backend 'company-xcode))
     ('prefix (and company-xcode-xcodeindex-executable
                   (not (company-in-string-or-comment))
-                  (company-xcode-tags)
-                  (company-grab-symbol)))
+                  (or (company-grab-symbol) 'stop)))
     ('candidates (let ((completion-ignore-case nil))
+                   (company-xcode-tags)
                    (all-completions arg (company-xcode-tags))))))