company-capf: Look up `face', not `font-lock-face'

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

diff --git a/company-keywords.el b/company-keywords.el
index 62d8c81dddf3a052cd81ca3cb3c0a69606577e53..e59eaa2afc641e29336b2799f29ed9b9ff3c56f4 100644 (file)
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -1,6 +1,6 @@
 ;;; company-keywords.el --- A company backend for programming language keywords
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2016  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -36,7 +36,7 @@
   ;; Please contribute corrections or additions.
   `((c++-mode
      "alignas" "alignof" "asm" "auto" "bool" "break" "case" "catch" "char"
-     "char16_t" "char32_t" "class" "const" "constexpr" "const_cast" "continue"
+     "char16_t" "char32_t" "class" "const" "const_cast" "constexpr" "continue"
      "decltype" "default" "delete" "do" "double" "dynamic_cast" "else" "enum"
      "explicit" "export" "extern" "false" "final" "float" "for" "friend"
      "goto" "if" "inline" "int" "long" "mutable" "namespace" "new" "noexcept"
@@ -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