[elpa] master 4a8289d 50/78: Merge pull request #751 from jojojames/kotlin-keywords

[Dmitry Gutov]

branch: master
commit 4a8289dc257c3991c3953b64671fc25c887b2ca4
Merge: 10807eb 0bd111d
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #751 from jojojames/kotlin-keywords
    
    Add keywords for kotlin-mode
---
 company-keywords.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/company-keywords.el b/company-keywords.el
index ac6e1c6..d010f7d 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -152,6 +152,13 @@
      "break" "catch" "const" "continue" "delete" "do" "else" "export" "for"
      "function" "if" "import" "in" "instanceOf" "label" "let" "new" "return"
      "switch" "this" "throw" "try" "typeof" "var" "void" "while" "with" 
"yield")
+    (kotlin-mode
+     "abstract" "annotation" "as" "break" "by" "catch" "class" "companion"
+     "const" "constructor" "continue" "data" "do" "else" "enum" "false" "final"
+     "finally" "for" "fun" "if" "import" "in" "in" "init" "inner" "interface"
+     "internal" "is" "lateinit" "nested" "null" "object" "open" "out" 
"override"
+     "package" "private" "protected" "public" "return" "super" "this" "throw"
+     "trait" "true" "try" "typealias" "val" "var" "when" "while")
     (objc-mode
      "@catch" "@class" "@encode" "@end" "@finally" "@implementation"
      "@interface" "@private" "@protected" "@protocol" "@public"