mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-08-05 16:48:38 +00:00
Merge branch 'master' of gitosis@majnematic.com:davesdots
This commit is contained in:
David Alexander Majnemer
commit
47ab302552
5 changed files with 118 additions and 10 deletions
|
|
@ -66,6 +66,10 @@ if command -v infocmp >/dev/null 2>&1 ; then
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ "${COLORTERM}" = "gnome-terminal" ]; then
|
||||
TERM="xterm-256color"
|
||||
fi
|
||||
|
||||
TERM=`fix_term $TERM`
|
||||
|
||||
# I am sorry to hear that you are running an
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
" $URL: https://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/vim/ftdetect/scala.vim $
|
||||
|
||||
au BufRead,BufNewFile *.scala set filetype=scala
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
" Vim syntax file
|
||||
" Language: llvm
|
||||
" Maintainer: The LLVM team, http://llvm.org/
|
||||
" Version: $Revision: 97271 $
|
||||
" Version: $Revision$
|
||||
|
||||
if version < 600
|
||||
syntax clear
|
||||
|
|
@ -49,6 +49,7 @@ syn keyword llvmKeyword hidden protected default
|
|||
syn keyword llvmKeyword except deplibs
|
||||
syn keyword llvmKeyword volatile fastcc coldcc cc ccc
|
||||
syn keyword llvmKeyword x86_stdcallcc x86_fastcallcc
|
||||
syn keyword llvmKeyword ptx_kernel ptx_device
|
||||
syn keyword llvmKeyword signext zeroext inreg sret nounwind noreturn
|
||||
syn keyword llvmKeyword nocapture byval nest readnone readonly noalias
|
||||
syn keyword llvmKeyword inlinehint noinline alwaysinline optsize ssp sspreq
|
||||
|
|
@ -57,14 +58,12 @@ syn keyword llvmKeyword module asm align tail to
|
|||
syn keyword llvmKeyword addrspace section alias sideeffect c gc
|
||||
syn keyword llvmKeyword target datalayout triple
|
||||
syn keyword llvmKeyword blockaddress
|
||||
syn keyword llvmKeyword union
|
||||
|
||||
" Obsolete keywords.
|
||||
syn keyword llvmError uninitialized implementation
|
||||
syn keyword llvmError getresult big little endian begin end
|
||||
syn keyword llvmError getresult begin end
|
||||
|
||||
" Misc syntax.
|
||||
syn match llvmIgnore /[%@]\d\+\>/
|
||||
syn match llvmNoName /[%@]\d\+\>/
|
||||
syn match llvmNumber /-\?\<\d\+\>/
|
||||
syn match llvmFloat /-\?\<\d\+\.\d*\(e[+-]\d\+\)\?\>/
|
||||
syn match llvmFloat /\<0x\x\+\>/
|
||||
|
|
@ -73,7 +72,7 @@ syn keyword llvmConstant zeroinitializer undef null
|
|||
syn match llvmComment /;.*$/
|
||||
syn region llvmString start=/"/ skip=/\\"/ end=/"/
|
||||
syn match llvmLabel /[-a-zA-Z$._][-a-zA-Z$._0-9]*:/
|
||||
syn match llvmIdentifier /[%@][-a-zA-Z$._0-9][-a-zA-Z$._0-9]*/
|
||||
syn match llvmIdentifier /[%@][-a-zA-Z$._][-a-zA-Z$._0-9]*/
|
||||
|
||||
" Syntax-highlight dejagnu test commands.
|
||||
syn match llvmSpecialComment /;\s*RUN:.*$/
|
||||
|
|
@ -99,7 +98,7 @@ if version >= 508 || !exists("did_c_syn_inits")
|
|||
HiLink llvmKeyword Keyword
|
||||
HiLink llvmBoolean Boolean
|
||||
HiLink llvmFloat Float
|
||||
HiLink llvmIgnore Ignore
|
||||
HiLink llvmNoName Identifier
|
||||
HiLink llvmConstant Constant
|
||||
HiLink llvmSpecialComment SpecialComment
|
||||
HiLink llvmError Error
|
||||
|
|
|
|||
106
vim/syntax/proto.vim
Normal file
106
vim/syntax/proto.vim
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
" Protocol Buffers - Google's data interchange format
|
||||
" Copyright 2008 Google Inc. All rights reserved.
|
||||
" http://code.google.com/p/protobuf/
|
||||
"
|
||||
" Redistribution and use in source and binary forms, with or without
|
||||
" modification, are permitted provided that the following conditions are
|
||||
" met:
|
||||
"
|
||||
" * Redistributions of source code must retain the above copyright
|
||||
" notice, this list of conditions and the following disclaimer.
|
||||
" * Redistributions in binary form must reproduce the above
|
||||
" copyright notice, this list of conditions and the following disclaimer
|
||||
" in the documentation and/or other materials provided with the
|
||||
" distribution.
|
||||
" * Neither the name of Google Inc. nor the names of its
|
||||
" contributors may be used to endorse or promote products derived from
|
||||
" this software without specific prior written permission.
|
||||
"
|
||||
" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
" OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
" This is the Vim syntax file for Google Protocol Buffers.
|
||||
"
|
||||
" Usage:
|
||||
"
|
||||
" 1. cp proto.vim ~/.vim/syntax/
|
||||
" 2. Add the following to ~/.vimrc:
|
||||
"
|
||||
" 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
|
||||
elseif exists("b:current_syntax")
|
||||
finish
|
||||
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
|
||||
syn keyword pbDefault default
|
||||
syn keyword pbExtend extend extensions to max
|
||||
syn keyword pbRPC service rpc returns
|
||||
|
||||
syn keyword pbType int32 int64 uint32 uint64 sint32 sint64
|
||||
syn keyword pbType fixed32 fixed64 sfixed32 sfixed64
|
||||
syn keyword pbType float double bool string bytes
|
||||
syn keyword pbTypedef enum
|
||||
syn keyword pbBool true false
|
||||
|
||||
syn match pbInt /-\?\<\d\+\>/
|
||||
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 region pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
|
||||
syn region pbString start=/"/ skip=/\\"/ end=/"/
|
||||
syn region pbString start=/'/ skip=/\\'/ end=/'/
|
||||
|
||||
if version >= 508 || !exists("did_proto_syn_inits")
|
||||
if version < 508
|
||||
let did_proto_syn_inits = 1
|
||||
command -nargs=+ HiLink hi link <args>
|
||||
else
|
||||
command -nargs=+ HiLink hi def link <args>
|
||||
endif
|
||||
|
||||
HiLink pbTodo Todo
|
||||
|
||||
HiLink pbSyntax Include
|
||||
HiLink pbStructure Structure
|
||||
HiLink pbRepeat Repeat
|
||||
HiLink pbDefault Keyword
|
||||
HiLink pbExtend Keyword
|
||||
HiLink pbRPC Keyword
|
||||
HiLink pbType Type
|
||||
HiLink pbTypedef Typedef
|
||||
HiLink pbBool Boolean
|
||||
|
||||
HiLink pbInt Number
|
||||
HiLink pbFloat Float
|
||||
HiLink pbComment Comment
|
||||
HiLink pbString String
|
||||
|
||||
delcommand HiLink
|
||||
endif
|
||||
|
||||
let b:current_syntax = "proto"
|
||||
2
vimrc
2
vimrc
|
|
@ -229,6 +229,8 @@ if has('autocmd')
|
|||
autocmd FileType c,cpp :call <SID>cabbrev()
|
||||
|
||||
autocmd BufRead,BufNewFile *.mm set filetype=noweb
|
||||
autocmd BufRead,BufNewFile *.scala set filetype=scala
|
||||
autocmd BufRead,BufNewFile *.proto setfiletype proto
|
||||
endif
|
||||
|
||||
" make tab reindent in normal mode
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue