diff --git a/colors/wombat.vim b/colors/wombat.vim index 9ad1e56..0155919 100644 --- a/colors/wombat.vim +++ b/colors/wombat.vim @@ -30,7 +30,7 @@ hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none hi VertSplit guifg=#444444 guibg=#444444 gui=none hi Folded guibg=#384048 guifg=#a0a8b0 gui=none -hi Title guifg=#f6f3e8 guibg=NONE gui=bold +hi Title guifg=#ff8c5e guibg=NONE gui=bold hi Visual guifg=#f6f3e8 guibg=#444444 gui=none hi SpecialKey guifg=#808080 guibg=#343434 gui=none diff --git a/ftdetect/mib.vim b/ftdetect/mib.vim new file mode 100644 index 0000000..08023a8 --- /dev/null +++ b/ftdetect/mib.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile *.mib set filetype=mib diff --git a/ftdetect/vala.vim b/ftdetect/vala.vim index 412d2d9..a6bb8d1 100644 --- a/ftdetect/vala.vim +++ b/ftdetect/vala.vim @@ -1 +1 @@ -autocmd BufRead,BufNewFile *.vala,*.vapa set filetype=vala +autocmd BufRead,BufNewFile *.vala,*.vapi set filetype=vala diff --git a/ftplugin/python.vim b/ftplugin/python.vim index e02b570..d7d03aa 100644 --- a/ftplugin/python.vim +++ b/ftplugin/python.vim @@ -5,3 +5,8 @@ setlocal expandtab setlocal autoindent setlocal smartindent setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class +if !exists("stripwhitespace_autocommand") + let stripwhitespace_autocommand = 1 + aug stripwhitespace + autocmd stripwhitespace BufWritePre %s/\s\+$//e +endif diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim index 04f99d1..a8473c1 100644 --- a/ftplugin/rst.vim +++ b/ftplugin/rst.vim @@ -2,8 +2,8 @@ setlocal textwidth=79 " Title and heading key mappings -inoremap ,t :t.s/./=/gt-2:nohj2A -inoremap ,1 :t.s/./=/g:nohA -inoremap ,2 :t.s/./*/g:nohA -inoremap ,3 :t.s/./+/g:nohA -inoremap ,4 :t.s/./-/g:nohA +inoremap ,t :t.s/./=/gt-2:noh2jo +inoremap ,1 :t.s/./=/g:noho +inoremap ,2 :t.s/./*/g:noho +inoremap ,3 :t.s/./+/g:noho +inoremap ,4 :t.s/./-/g:noho diff --git a/plugin/00-dustin.vim b/plugin/00-dustin.vim index d9bf50b..63d70c8 100644 --- a/plugin/00-dustin.vim +++ b/plugin/00-dustin.vim @@ -54,12 +54,13 @@ if has('win32') " Windows has a different font naming pattern " Also, Consolas is more widely available than Luxi set guifont=Consolas:h9:cANSI - " The default directory setting uses C:\tmp and C:\temp, neither of which - " are valid on Windows 6.0 and later - set directory=.,$TEMP, + " Store swap files together in the user's temp directory + set directory=$TEMP\\\ elseif has('unix') " Nice font and size (escape spaces) (GUI only) set guifont=Luxi\ Mono\ 9 + " Store swap files together in the user's cache directory + set directory=~/.cache/vim// endif " Open all folds by default diff --git a/syntax/mib.vim b/syntax/mib.vim new file mode 100644 index 0000000..a29242d --- /dev/null +++ b/syntax/mib.vim @@ -0,0 +1,77 @@ +" Vim syntax file +" Language: Vim syntax file for SNMPv1 and SNMPv2 MIB and SMI files +" Author: David Pascoe +" Written: Wed Jan 28 14:37:23 GMT--8:00 1998 +" Last Changed: Thu Feb 27 10:18:16 WST 2003 + +" For version 5.x: Clear all syntax items +" For version 6.x: Quit when a syntax file was already loaded +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +if version >= 600 + setlocal iskeyword=@,48-57,_,128-167,224-235,-,:,= +else + set iskeyword=@,48-57,_,128-167,224-235,-,:,= +endif + +syn keyword mibImplicit ACCESS ANY AUGMENTS BEGIN BIT BITS BOOLEAN CHOICE +syn keyword mibImplicit COMPONENTS CONTACT-INFO DEFINITIONS DEFVAL +syn keyword mibImplicit DESCRIPTION DISPLAY-HINT END ENTERPRISE EXTERNAL FALSE +syn keyword mibImplicit FROM GROUP IMPLICIT IMPLIED IMPORTS INDEX +syn keyword mibImplicit LAST-UPDATED MANDATORY-GROUPS MAX-ACCESS +syn keyword mibImplicit MIN-ACCESS MODULE MODULE-COMPLIANCE MODULE-IDENTITY +syn keyword mibImplicit NOTIFICATION-GROUP NOTIFICATION-TYPE NOTIFICATIONS +syn keyword mibImplicit NULL OBJECT-GROUP OBJECT-IDENTITY OBJECT-TYPE +syn keyword mibImplicit OBJECTS OF OPTIONAL ORGANIZATION REFERENCE +syn keyword mibImplicit REVISION SEQUENCE SET SIZE STATUS SYNTAX +syn keyword mibImplicit TEXTUAL-CONVENTION TRAP-TYPE TRUE UNITS VARIABLES +syn keyword mibImplicit WRITE-SYNTAX ::= +syn keyword mibValue accessible-for-notify current DisplayString +syn keyword mibValue deprecated mandatory not-accessible obsolete optional +syn keyword mibValue read-create read-only read-write write-only INTEGER +syn keyword mibValue Counter Gauge IpAddress OCTET STRING experimental mib-2 +syn keyword mibValue TimeTicks RowStatus TruthValue UInteger32 snmpModules +syn keyword mibValue Integer32 Counter32 TestAndIncr TimeStamp InstancePointer +syn keyword mibValue OBJECT IDENTIFIER Gauge32 AutonomousType Counter64 +syn keyword mibValue PhysAddress TimeInterval MacAddress StorageType RowPointer +syn keyword mibValue TDomain TAddress ifIndex + +" Epilogue SMI extensions +syn keyword mibEpilogue FORCE-INCLUDE EXCLUDE cookie get-function set-function +syn keyword mibEpilogue test-function get-function-async set-function-async +syn keyword mibEpilogue test-function-async next-function next-function-async +syn keyword mibEpilogue leaf-name +syn keyword mibEpilogue DEFAULT contained + +syn match mibComment "\ *--.*$" +syn match mibNumber "\<['0-9a-fA-FhH]*\>" +syn region mibDescription start="\"" end="\"" contains=DEFAULT + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_mib_syn_inits") + if version < 508 + let did_mib_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink mibImplicit Statement + HiLink mibComment Comment + HiLink mibConstants String + HiLink mibNumber Number + HiLink mibDescription Identifier + HiLink mibEpilogue SpecialChar + HiLink mibValue Structure + delcommand HiLink +endif + +let b:current_syntax = "mib" + +" vim: ts=8