diff options
| author | Paul Yang <paulyang1211@gmail.com> | 2015-05-21 20:11:26 -0700 |
|---|---|---|
| committer | Paul Yang <paulyang1211@gmail.com> | 2015-05-21 20:11:26 -0700 |
| commit | d94e65afda9abf9e7bd789e3e7fb15f33b524eb8 (patch) | |
| tree | 63fffc179a4766fb3042d58c49d2285f93be912a /editors | |
| parent | e1000189bff3cbd0e309c279364dac36541809db (diff) | |
| parent | 5db217305f37a79eeccd70f000088a06ec82fcec (diff) | |
| download | protobuf-d94e65afda9abf9e7bd789e3e7fb15f33b524eb8.tar.gz protobuf-d94e65afda9abf9e7bd789e3e7fb15f33b524eb8.tar.bz2 protobuf-d94e65afda9abf9e7bd789e3e7fb15f33b524eb8.zip | |
Merge pull request #413 from TeBoring/master
down-integrate internal changes
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/proto.vim | 2 | ||||
| -rw-r--r-- | editors/protobuf-mode.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editors/proto.vim b/editors/proto.vim index 23085a28..7f1aeb73 100644 --- a/editors/proto.vim +++ b/editors/proto.vim @@ -57,7 +57,7 @@ syn keyword pbSyntax syntax import option syn keyword pbStructure package message group oneof syn keyword pbRepeat optional required repeated syn keyword pbDefault default -syn keyword pbExtend extend extensions to max +syn keyword pbExtend extend extensions to max reserved syn keyword pbRPC service rpc returns syn keyword pbType int32 int64 uint32 uint64 sint32 sint64 diff --git a/editors/protobuf-mode.el b/editors/protobuf-mode.el index 09aecc93..f615a0af 100644 --- a/editors/protobuf-mode.el +++ b/editors/protobuf-mode.el @@ -106,7 +106,7 @@ ;; cc-mode. So, we approximate as best we can. (c-lang-defconst c-type-list-kwds - protobuf '("extensions" "to")) + protobuf '("extensions" "to" "reserved")) (c-lang-defconst c-typeless-decl-kwds protobuf '("extend" "rpc" "option" "returns")) |