[elpa] master 1f5389b 146/173: Merge pull request #483 from stardiviner/add-julia-keywords

[Dmitry Gutov]

branch: master
commit 1f5389bf0d2cd8d9de7cb3c727e1fa3d2a8ecbc6
Merge: c357d5a 3ec9d5d
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Merge pull request #483 from stardiviner/add-julia-keywords
    
    add Julia keywords and general types.
---
 company-keywords.el |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/company-keywords.el b/company-keywords.el
index d14cda0..e59eaa2 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -216,12 +216,20 @@
      "new" "null" "object" "override" "package" "private" "protected"
      "return" "sealed" "super" "this" "throw" "trait" "true" "try" "type" "val"
      "var" "while" "with" "yield")
+    (julia-mode
+     "abstract" "break" "case" "catch" "const" "continue" "do" "else" "elseif"
+     "end" "eval" "export" "false" "finally" "for" "function" "global" "if"
+     "ifelse" "immutable" "import" "importall" "in" "let" "macro" "module"
+     "otherwise" "quote" "return" "switch" "throw" "true" "try" "type"
+     "typealias" "using" "while"
+     )
     ;; aliases
     (js2-mode . javascript-mode)
     (espresso-mode . javascript-mode)
     (js-mode . javascript-mode)
     (cperl-mode . perl-mode)
-    (jde-mode . java-mode))
+    (jde-mode . java-mode)
+    (ess-julia-mode . julia-mode))
   "Alist mapping major-modes to sorted keywords for `company-keywords'.")
 
 ;;;###autoload