[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4d921fe 39/66: Merge pull request #817 from chunzhouyu/mas
From: |
Dmitry Gutov |
Subject: |
[elpa] master 4d921fe 39/66: Merge pull request #817 from chunzhouyu/master |
Date: |
Mon, 5 Nov 2018 18:19:18 -0500 (EST) |
branch: master
commit 4d921fe0face2d89be2014d869b0f1e742dd4480
Merge: 1f836b6 045b23a
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #817 from chunzhouyu/master
move golang's keywords to the right place
---
company-keywords.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/company-keywords.el b/company-keywords.el
index 2ba12fe..52fc226 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -141,6 +141,11 @@
"sum_suffix" "system_clock" "tan" "tanh" "target" "template" "then"
"tiny" "transfer" "transpose" "trim" "true" "type" "ubound" "unpack"
"use" "value" "verify" "volatile" "wait" "where" "while" "with" "write"))
+ (go-mode
+ ;; from https://golang.org/ref/spec#Keywords
+ "break" "case" "chan" "const" "continue" "default" "defer" "else"
"fallthrough"
+ "for" "func" "go" "goto" "if" "import" "interface" "map" "package" "range"
+ "return" "select" "struct" "switch" "type" "var")
(java-mode
"abstract" "assert" "boolean" "break" "byte" "case" "catch" "char" "class"
"continue" "default" "do" "double" "else" "enum" "extends" "final"
@@ -224,10 +229,6 @@
"then" "true" "undef" "unless" "until" "when" "while" "yield")
;; From https://doc.rust-lang.org/grammar.html#keywords
;; but excluding unused reserved words:
https://www.reddit.com/r/rust/comments/34fq0k/is_there_a_good_list_of_rusts_keywords/cqucvnj
- (go-mode
- "break" "case" "chan" "const" "continue" "default" "defer" "else"
"fallthrough"
- "for" "func" "go" "goto" "if" "import" "interface" "map" "package" "range"
- "return" "select" "struct" "switch" "type" "var")
(rust-mode
"Self"
"as" "box" "break" "const" "continue" "crate" "else" "enum" "extern"
- [elpa] master f404a12 30/66: Add some tests for the previous commits, (continued)
- [elpa] master f404a12 30/66: Add some tests for the previous commits, Dmitry Gutov, 2018/11/05
- [elpa] master 0325a40 11/66: Remove an unnecessary test, Dmitry Gutov, 2018/11/05
- [elpa] master ed1085f 19/66: Merge pull request #771 from Wilfred/interactive-example, Dmitry Gutov, 2018/11/05
- [elpa] master 7d6ab3c 22/66: company-keywords: Support thrift-mode, Dmitry Gutov, 2018/11/05
- [elpa] master 270976b 25/66: Update Javascript and Python keywords, Dmitry Gutov, 2018/11/05
- [elpa] master 287a5fb 18/66: Make example backend interactive, Dmitry Gutov, 2018/11/05
- [elpa] master 46680da 21/66: company-css: Improve performance, Dmitry Gutov, 2018/11/05
- [elpa] master d26ec71 23/66: Merge pull request #785 from ylectric/company-keywords/thrift-mode, Dmitry Gutov, 2018/11/05
- [elpa] master 392dadd 28/66: Per #798, #762: Fix company-capf's highlighting of non-prefix matches, Dmitry Gutov, 2018/11/05
- [elpa] master f1aef4d 45/66: add reference url for go-mode's keywords, Dmitry Gutov, 2018/11/05
- [elpa] master 4d921fe 39/66: Merge pull request #817 from chunzhouyu/master,
Dmitry Gutov <=
- [elpa] master 1c76850 50/66: Reformat, Dmitry Gutov, 2018/11/05
- [elpa] master ddfdcb7 20/66: Abort when completion-at-point is invoked, Dmitry Gutov, 2018/11/05
- [elpa] master 5015aad 41/66: Switch to npostavs/emacs-travis binaries, Dmitry Gutov, 2018/11/05
- [elpa] master 1c28831 51/66: add some golang's builtin funcitons to go-mode, Dmitry Gutov, 2018/11/05
- [elpa] master c984355 52/66: resort the go-mode in company-keywords.el, Dmitry Gutov, 2018/11/05
- [elpa] master 4205ad6 61/66: Merge pull request #830 from jabranham/alias, Dmitry Gutov, 2018/11/05
- [elpa] master 63fdb96 40/66: add some golang fake keywords for a better programming experience, Dmitry Gutov, 2018/11/05
- [elpa] master 9e8bd0b 42/66: Merge pull request #821 from iquiw/emacs-travis-bin, Dmitry Gutov, 2018/11/05
- [elpa] master 779662f 24/66: Truncate the Clang error in the echo area, Dmitry Gutov, 2018/11/05
- [elpa] master a913803 27/66: company-diag: Catch any error in `completions', Dmitry Gutov, 2018/11/05