Apply Leandro Lucarella <llucax@gmail.com>'s patches for VIM highlighting
and not setting execute bit on protoc outputs.
This commit is contained in:
parent
24856db0e9
commit
8ccb79057e
@ -38,3 +38,4 @@ Non-Google patch contributors:
|
||||
Kevin Ko <kevin.s.ko@gmail.com>
|
||||
Johan Euphrosine <proppy@aminche.com>
|
||||
Ulrich Kunitz <kune@deine-taler.de>
|
||||
Leandro Lucarella <llucax@gmail.com>
|
||||
|
@ -23,6 +23,9 @@
|
||||
" augroup filetype
|
||||
" au! BufRead,BufNewFile *.proto setfiletype proto
|
||||
" augroup end
|
||||
"
|
||||
" Or just create a new file called ~/.vim/ftdetect/proto.vim with the
|
||||
" previous lines on it.
|
||||
|
||||
if version < 600
|
||||
syntax clear
|
||||
@ -32,6 +35,9 @@ endif
|
||||
|
||||
syn case match
|
||||
|
||||
syn keyword pbTodo contained TODO FIXME XXX
|
||||
syn cluster pbCommentGrp contains=pbTodo
|
||||
|
||||
syn keyword pbSyntax syntax import option
|
||||
syn keyword pbStructure package message group
|
||||
syn keyword pbRepeat optional required repeated
|
||||
@ -50,7 +56,7 @@ syn match pbInt /\<0[xX]\x+\>/
|
||||
syn match pbFloat /\<-\?\d*\(\.\d*\)\?/
|
||||
" TODO: .proto also supports C-style block comments;
|
||||
" see /usr/share/vim/vim70/syntax/c.vim for how it's done.
|
||||
syn match pbComment /\/\/.*$/
|
||||
syn region pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
|
||||
syn region pbString start=/"/ skip=/\\"/ end=/"/
|
||||
syn region pbString start=/'/ skip=/\\'/ end=/'/
|
||||
|
||||
@ -62,6 +68,8 @@ if version >= 508 || !exists("did_proto_syn_inits")
|
||||
command -nargs=+ HiLink hi def link <args>
|
||||
endif
|
||||
|
||||
HiLink pbTodo Todo
|
||||
|
||||
HiLink pbSyntax Include
|
||||
HiLink pbStructure Structure
|
||||
HiLink pbRepeat Repeat
|
||||
|
@ -203,7 +203,7 @@ io::ZeroCopyOutputStream* CommandLineInterface::DiskOutputDirectory::Open(
|
||||
do {
|
||||
file_descriptor =
|
||||
open((root_ + filename).c_str(),
|
||||
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0777);
|
||||
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
|
||||
} while (file_descriptor < 0 && errno == EINTR);
|
||||
|
||||
if (file_descriptor < 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user