mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-16 11:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:5837f1f #4066

Browse Source 
Update runtime files.

5837f1f447
This commit is contained in:
Justin Gassner
2016-01-19 21:58:36 +01:00
committed by Florian Walch
parent feb70192a8
commit 0ccd1ef725
5 changed files with 177 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/pattern.txt
View File

@@ -1,4 +1,4 @@
*pattern.txt* For Vim version 7.4. Last change: 2015 Feb 17 *pattern.txt* For Vim version 7.4. Last change: 2015 Mar 16
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1052,7 +1052,10 @@ x A single character, with no special meaning, matches itself
*E769* *E769*
When the ']' is not there Vim will not give an error message but When the ']' is not there Vim will not give an error message but
assume no collection is used. Useful to search for '['. However, you assume no collection is used. Useful to search for '['. However, you
do get E769 for internal searching. do get E769 for internal searching. And be aware that in a
`:substitute` command the whole command becomes the pattern. E.g.
":s/[/x/" searches for "[/x" and replaces it with nothing. It does
not search for "[" and replaces it with "x"!
If the sequence begins with "^", it matches any single character NOT If the sequence begins with "^", it matches any single character NOT
in the collection: "[^xyz]" matches anything but 'x', 'y' and 'z'. in the collection: "[^xyz]" matches anything but 'x', 'y' and 'z'.

4
runtime/doc/syntax.txt
View File

@@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.4. Last change: 2015 Feb 22 *syntax.txt* For Vim version 7.4. Last change: 2015 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4632,6 +4632,8 @@ ctermbg={color-nr} *highlight-ctermbg*
Note that for some color terminals these names may result in the wrong Note that for some color terminals these names may result in the wrong
colors! colors!
You can also use "NONE" to remove the color.
*:hi-normal-cterm* *:hi-normal-cterm*
When setting the "ctermfg" or "ctermbg" colors for the Normal group, When setting the "ctermfg" or "ctermbg" colors for the Normal group,
these will become the colors used for the non-highlighted text. these will become the colors used for the non-highlighted text.

6
runtime/filetype.vim
View File

@@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2015 Jan 14 " Last Change: 2015 Mar 13
" Listen very carefully, I will say this only once " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")
@@ -1262,8 +1262,8 @@ au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf m
" Mplayer config " Mplayer config
au BufNewFile,BufRead mplayer.conf,*/.mplayer/config setf mplayerconf au BufNewFile,BufRead mplayer.conf,*/.mplayer/config setf mplayerconf
" Moterola S record " Motorola S record
au BufNewFile,BufRead *.s19,*.s28,*.s37 setf srec au BufNewFile,BufRead *.s19,*.s28,*.s37,*.mot,*.srec setf srec
" Mrxvtrc " Mrxvtrc
au BufNewFile,BufRead mrxvtrc,.mrxvtrc setf mrxvtrc au BufNewFile,BufRead mrxvtrc,.mrxvtrc setf mrxvtrc

95
runtime/syntax/hex.vim
View File

@@ -1,7 +1,29 @@
" Vim syntax file " Vim syntax file
" Language: Intel hex MCS51 " Language: Intel HEX
" Maintainer: Sams Ricahrd <sams@ping.at> " Maintainer: Markus Heidelberg <markus.heidelberg@web.de>
" Last Change: 2003 Apr 25 " Previous version: Sams Ricahrd <sams@ping.at>
" Last Change: 2015 Feb 24
" Each record (line) is built as follows:
"
" field digits states
"
" +----------+
" | start | 1 (':') hexRecStart
" +----------+
" | count | 2 hexDataByteCount
" +----------+
" | address | 4 hexNoAddress, hexDataAddress, (hexAddressFieldUnknown)
" +----------+
" | type | 2 hexRecType, (hexRecTypeUnknown)
" +----------+
" | data | 0..510 hexDataOdd, hexDataEven, hexExtendedAddress, hexStartAddress, (hexDataFieldUnknown, hexDataUnexpected)
" +----------+
" | checksum | 2 hexChecksum
" +----------+
"
" States in parentheses in the upper format description indicate that they
" should not appear in a valid file.
" For version 5.x: Clear all syntax items " For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded " For version 6.x: Quit when a syntax file was already loaded
@@ -11,21 +33,39 @@ elseif exists("b:current_syntax")
finish finish
endif endif
syn case ignore syn match hexRecStart "^:"
" storage types syn match hexDataByteCount "^:[0-9a-fA-F]\{2}" contains=hexRecStart nextgroup=hexAddress
syn match hexChecksum "[0-9a-fA-F]\{2}$" syn match hexAddress "[0-9a-fA-F]\{4}" transparent contained nextgroup=hexRecTypeUnknown,hexRecType
syn match hexAdress "^:[0-9a-fA-F]\{6}" contains=hexDataByteCount " The address field groups include the record type field in the last 2
syn match hexRecType "^:[0-9a-fA-F]\{8}" contains=hexAdress " characters, the proper match for highlighting follows below.
syn match hexDataByteCount contained "^:[0-9a-fA-F]\{2}" contains=hexStart syn match hexAddressFieldUnknown "^:[0-9a-fA-F]\{8}" contains=hexDataByteCount nextgroup=hexDataFieldUnknown,hexChecksum
syn match hexStart contained "^:" syn match hexDataAddress "^:[0-9a-fA-F]\{6}00" contains=hexDataByteCount nextgroup=hexDataOdd,hexChecksum
syn match hexExtAdrRec "^:02000002[0-9a-fA-F]\{4}" contains=hexSpecRec syn match hexNoAddress "^:[0-9a-fA-F]\{6}01" contains=hexDataByteCount nextgroup=hexDataUnexpected,hexChecksum
syn match hexExtLinAdrRec "^:02000004[0-9a-fA-F]\{4}" contains=hexSpecRec syn match hexNoAddress "^:[0-9a-fA-F]\{6}0[24]" contains=hexDataByteCount nextgroup=hexExtendedAddress
syn match hexSpecRec contained "^:0[02]00000[124]" contains=hexStart syn match hexNoAddress "^:[0-9a-fA-F]\{6}0[35]" contains=hexDataByteCount nextgroup=hexStartAddress
syn match hexEOF "^:00000001" contains=hexStart
syn case match syn match hexRecTypeUnknown "[0-9a-fA-F]\{2}" contained
syn match hexRecType "0[0-5]" contained
syn match hexDataFieldUnknown "[0-9a-fA-F]\{2}" contained nextgroup=hexDataFieldUnknown,hexChecksum
" alternating highlight per byte for easier reading
syn match hexDataOdd "[0-9a-fA-F]\{2}" contained nextgroup=hexDataEven,hexChecksum
syn match hexDataEven "[0-9a-fA-F]\{2}" contained nextgroup=hexDataOdd,hexChecksum
" data bytes which should not exist
syn match hexDataUnexpected "[0-9a-fA-F]\{2}" contained nextgroup=hexDataUnexpected,hexChecksum
" Data digit pair regex usage also results in only highlighting the checksum
" if the number of data characters is even.
" special data fields
syn match hexExtendedAddress "[0-9a-fA-F]\{4}" contained nextgroup=hexDataUnexpected,hexChecksum
syn match hexStartAddress "[0-9a-fA-F]\{8}" contained nextgroup=hexDataUnexpected,hexChecksum
syn match hexChecksum "[0-9a-fA-F]\{2}$" contained
" Folding Data Records below an Extended Segment/Linear Address Record
syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0" end="^:"me=s-1 fold transparent
" Define the default highlighting. " Define the default highlighting.
" For version 5.7 and earlier: only when not done already " For version 5.7 and earlier: only when not done already
@@ -38,16 +78,21 @@ if version >= 508 || !exists("did_hex_syntax_inits")
command -nargs=+ HiLink hi def link <args> command -nargs=+ HiLink hi def link <args>
endif endif
" The default methods for highlighting. Can be overridden later " The default methods for highlighting. Can be overridden later
HiLink hexStart SpecialKey HiLink hexRecStart hexRecType
HiLink hexDataByteCount Constant HiLink hexDataByteCount Constant
HiLink hexAdress Comment hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
HiLink hexRecType WarningMsg HiLink hexDataAddress Comment
HiLink hexChecksum Search HiLink hexNoAddress DiffAdd
HiLink hexExtAdrRec hexAdress HiLink hexRecTypeUnknown hexRecType
HiLink hexEOF hexSpecRec HiLink hexRecType WarningMsg
HiLink hexExtLinAdrRec hexAdress hi def hexDataFieldUnknown term=italic cterm=italic gui=italic
HiLink hexSpecRec DiffAdd hi def hexDataOdd term=bold cterm=bold gui=bold
hi def hexDataEven term=NONE cterm=NONE gui=NONE
HiLink hexDataUnexpected Error
HiLink hexExtendedAddress hexDataAddress
HiLink hexStartAddress hexDataAddress
HiLink hexChecksum DiffChange
delcommand HiLink delcommand HiLink
endif endif

96
runtime/syntax/srec.vim Normal file
View File

@@ -0,0 +1,96 @@
" Vim syntax file
" Language: Motorola S-Record
" Maintainer: Markus Heidelberg <markus.heidelberg@web.de>
" Last Change: 2015 Feb 24
" Each record (line) is built as follows:
"
" field digits states
"
" +----------+
" | start | 1 ('S') srecRecStart
" +----------+
" | type | 1 srecRecType, (srecRecTypeUnknown)
" +----------+
" | count | 2 srecByteCount
" +----------+
" | address | 4/6/8 srecNoAddress, srecDataAddress, srecRecCount, srecStartAddress, (srecAddressFieldUnknown)
" +----------+
" | data | 0..504/502/500 srecDataOdd, srecDataEven, (srecDataUnexpected)
" +----------+
" | checksum | 2 srecChecksum
" +----------+
"
" States in parentheses in the upper format description indicate that they
" should not appear in a valid file.
" 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
syn match srecRecStart "^S"
syn match srecRecTypeUnknown "^S." contains=srecRecStart
syn match srecRecType "^S[0-35-9]" contains=srecRecStart
syn match srecByteCount "^S.[0-9a-fA-F]\{2}" contains=srecRecTypeUnknown nextgroup=srecAddressFieldUnknown,srecChecksum
syn match srecByteCount "^S[0-35-9][0-9a-fA-F]\{2}" contains=srecRecType
syn match srecAddressFieldUnknown "[0-9a-fA-F]\{2}" contained nextgroup=srecAddressFieldUnknown,srecChecksum
syn match srecNoAddress "^S0[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
syn match srecDataAddress "^S1[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
syn match srecDataAddress "^S2[0-9a-fA-F]\{8}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
syn match srecDataAddress "^S3[0-9a-fA-F]\{10}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
syn match srecRecCount "^S5[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
syn match srecRecCount "^S6[0-9a-fA-F]\{8}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
syn match srecStartAddress "^S7[0-9a-fA-F]\{10}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
syn match srecStartAddress "^S8[0-9a-fA-F]\{8}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
syn match srecStartAddress "^S9[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
" alternating highlight per byte for easier reading
syn match srecDataOdd "[0-9a-fA-F]\{2}" contained nextgroup=srecDataEven,srecChecksum
syn match srecDataEven "[0-9a-fA-F]\{2}" contained nextgroup=srecDataOdd,srecChecksum
" data bytes which should not exist
syn match srecDataUnexpected "[0-9a-fA-F]\{2}" contained nextgroup=srecDataUnexpected,srecChecksum
" Data digit pair regex usage also results in only highlighting the checksum
" if the number of data characters is even.
syn match srecChecksum "[0-9a-fA-F]\{2}$" contained
" 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_srec_syntax_inits")
if version < 508
let did_srec_syntax_inits = 1
command -nargs=+ HiLink hi link <args>
else
command -nargs=+ HiLink hi def link <args>
endif
" The default methods for highlighting. Can be overridden later
HiLink srecRecStart srecRecType
HiLink srecRecTypeUnknown srecRecType
HiLink srecRecType WarningMsg
HiLink srecByteCount Constant
hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
HiLink srecNoAddress DiffAdd
HiLink srecDataAddress Comment
HiLink srecRecCount srecNoAddress
HiLink srecStartAddress srecDataAddress
hi def srecDataOdd term=bold cterm=bold gui=bold
hi def srecDataEven term=NONE cterm=NONE gui=NONE
HiLink srecDataUnexpected Error
HiLink srecChecksum DiffChange
delcommand HiLink
endif
let b:current_syntax = "srec"
" vim: ts=8