[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1f5389b 146/173: Merge pull request #483 from stardiviner/
From: |
Dmitry Gutov |
Subject: |
[elpa] master 1f5389b 146/173: Merge pull request #483 from stardiviner/add-julia-keywords |
Date: |
Thu, 23 Jun 2016 00:28:46 +0000 (UTC) |
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
- [elpa] master ec9f6c7 127/173: Moved company-tempo-insert call to post-completion, (continued)
- [elpa] master ec9f6c7 127/173: Moved company-tempo-insert call to post-completion, Dmitry Gutov, 2016/06/22
- [elpa] master bdf6b22 138/173: Fix #474 by filtering dabbrev completions at the end, Dmitry Gutov, 2016/06/22
- [elpa] master e65ab4c 111/173: Merge pull request #453 from jtatarik/bbdb-multiple-recipients, Dmitry Gutov, 2016/06/22
- [elpa] master 077182c 154/173: Add autoload cookies, Dmitry Gutov, 2016/06/22
- [elpa] master a619a93 132/173: Merge pull request #465 from vspinu/files-optim, Dmitry Gutov, 2016/06/22
- [elpa] master e357eb6 164/173: Remove the [return] binding (#530), Dmitry Gutov, 2016/06/22
- [elpa] master b8f8777 161/173: New transformer: company-sort-prefer-same-case-prefix, Dmitry Gutov, 2016/06/22
- [elpa] master 8cc284e 162/173: Merge pull request #531 from juergenhoetzel/master, Dmitry Gutov, 2016/06/22
- [elpa] master 387b4d1 106/173: Fix "obsolete function" warning, Dmitry Gutov, 2016/06/22
- [elpa] master 0a6bfa9 108/173: company-capf: Add :company-prefix-length property function, Dmitry Gutov, 2016/06/22
- [elpa] master 1f5389b 146/173: Merge pull request #483 from stardiviner/add-julia-keywords,
Dmitry Gutov <=
- [elpa] master 6c8763a 151/173: Fixed lighter for grouped backends, Dmitry Gutov, 2016/06/22
- [elpa] master 7d0db9e 135/173: Move company-files closer to the front of company-backends, Dmitry Gutov, 2016/06/22
- [elpa] master b001e91 099/173: Fix a test (after adding `should`), Dmitry Gutov, 2016/06/22
- [elpa] master 779de03 117/173: Merge pull request #457 from cpitclaudel/wip-simplify-electric, Dmitry Gutov, 2016/06/22
- [elpa] master faa8f84 120/173: Add company-semantic-insert-arguments, Dmitry Gutov, 2016/06/22
- [elpa] master c357d5a 144/173: company-grab-line: Make it work in ERC prompt, Dmitry Gutov, 2016/06/22
- [elpa] master a53911c 130/173: Separate sort of candidates and children in company-files, Dmitry Gutov, 2016/06/22
- [elpa] master 99ce60b 125/173: Add company-search-flex-regexp, Dmitry Gutov, 2016/06/22
- [elpa] master ada2ede 128/173: Merge pull request #461 from rlph/patch-1, Dmitry Gutov, 2016/06/22
- [elpa] master c38d382 147/173: Fixed typo, Dmitry Gutov, 2016/06/22