diff options
| author | Bo Yang <teboring@google.com> | 2015-05-21 14:28:59 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-05-21 19:32:02 -0700 |
| commit | 5db217305f37a79eeccd70f000088a06ec82fcec (patch) | |
| tree | be53dcf0c0b47ef9178ab8a6fa5c1946ee84a28f /editors | |
| parent | 56095026ccc2f755a6fdb296e30c3ddec8f556a2 (diff) | |
| download | protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.tar.gz protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.tar.bz2 protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.zip | |
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")) |