Skip to content

Commit

Permalink
vim-patch:269f595
Browse files Browse the repository at this point in the history
Updated runtime files.

vim/vim@269f595
  • Loading branch information
Shougo committed Oct 15, 2016
1 parent f3efb72 commit c91a0dc
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 90 deletions.
8 changes: 7 additions & 1 deletion runtime/doc/message.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*message.txt* For Vim version 7.4. Last change: 2016 Feb 27
*message.txt* For Vim version 7.4. Last change: 2016 Jul 14


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -656,6 +656,12 @@ You must be using an awful lot of buffers. It's now possible that two buffers
have the same number, which causes various problems. You might want to exit
Vim and restart it.

*E931* >
Buffer cannot be registered
Out of memory or a duplicate buffer number. May habben after W14. Looking up
a buffer will not always work, better restart Vim.

*E296* *E297* >
Seek error in swap file write
Write error in swap file
Expand Down
6 changes: 3 additions & 3 deletions runtime/doc/motion.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*motion.txt* For Vim version 7.4. Last change: 2015 Jun 06
*motion.txt* For Vim version 7.4. Last change: 2016 Jul 12


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -569,15 +569,15 @@ i[ "inner [] block", select [count] '[' ']' blocks. This
When used in Visual mode it is made characterwise.

a) *v_a)* *a)* *a(*
a( *v_ab* *v_a(* *ab*
a( *vab* *v_ab* *v_a(* *ab*
ab "a block", select [count] blocks, from "[count] [(" to
the matching ')', including the '(' and ')' (see
|[(|). Does not include white space outside of the
parenthesis.
When used in Visual mode it is made characterwise.

i) *v_i)* *i)* *i(*
i( *v_ib* *v_i(* *ib*
i( *vib* *v_ib* *v_i(* *ib*
ib "inner block", select [count] blocks, from "[count] [("
to the matching ')', excluding the '(' and ')' (see
|[(|).
Expand Down
4 changes: 3 additions & 1 deletion runtime/doc/options.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*options.txt* For Vim version 7.4. Last change: 2016 Mar 19
*options.txt* For Vim version 7.4. Last change: 2016 Jul 12


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -5445,6 +5445,8 @@ A jump table for the options with a short description can be found at |Q_op|.
The |FilterReadPre|, |FilterReadPost| and |FilterWritePre|,
|FilterWritePost| autocommands event are not triggered when
'shelltemp' is off.
The `system()` function does not respect this option and always uses
temp files.

*'shellxescape'* *'sxe'*
'shellxescape' 'sxe' string (default: "";
Expand Down
8 changes: 3 additions & 5 deletions runtime/filetype.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2016 Apr 29
" Last Change: 2016 Jul 12

" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
Expand Down Expand Up @@ -1617,11 +1617,9 @@ au BufNewFile,BufRead */etc/protocols setf protocols
" Pyrex
au BufNewFile,BufRead *.pyx,*.pxd setf pyrex

" Python
au BufNewFile,BufRead *.py,*.pyw setf python

" Python, Python Shell Startup Files
" Quixote (Python-based web framework)
au BufNewFile,BufRead *.ptl setf python
au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc,*.ptl setf python

" Radiance
au BufNewFile,BufRead *.rad,*.mat setf radiance
Expand Down
134 changes: 54 additions & 80 deletions runtime/syntax/awk.vim
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
" Vim syntax file
" Language: awk, nawk, gawk, mawk
" Maintainer: Antonio Colombo <azc100@gmail.com>
" Last Change: 2014 Oct 21
" Last Change: 2016 Jul 15

" AWK ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
" AWK ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
" The AWK Programming Language, Addison-Wesley, 1988

" GAWK ref. is: Arnold D. Robbins
" Effective AWK Programming, Third Edition, O'Reilly, 2001
" Effective AWK Programming, Fourth Edition, O'Reilly, 2015
" (also available with the gawk source distribution)
" (also available and updated with the gawk source distribution)

" MAWK is a "new awk" meaning it implements AWK ref.
" mawk conforms to the Posix 1003.2 (draft 11.3)
Expand All @@ -19,11 +19,8 @@
" TODO:
" Dig into the commented out syntax expressions below.

" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
syn clear
elseif exists("b:current_syntax")
" Quit when a syntax file was already loaded
if exists("b:current_syntax")
finish
endif

Expand All @@ -35,13 +32,13 @@ set cpo&vim
syn keyword awkStatement break continue delete exit
syn keyword awkStatement function getline next
syn keyword awkStatement print printf return
" GAWK ref. Chapter 7
syn keyword awkStatement nextfile
" GAWK ref. Chapter 7-9
syn keyword awkStatement switch nextfile
syn keyword awkStatement func
"
" GAWK ref. Chapter 9, Functions
"
" Numeric Functions
syn keyword awkFunction atan2 cos div exp int log rand sin sqrt srand
syn keyword awkFunction atan2 cos exp int intdiv log rand sin sqrt srand
" String Manipulation Functions
syn keyword awkFunction asort asort1 gensub gsub index length match
syn keyword awkFunction patsplit split sprintf strtonum sub substr
Expand All @@ -52,17 +49,17 @@ syn keyword awkFunction close fflush system
syn keyword awkFunction mktime strftime systime
" Bit Manipulation Functions
syn keyword awkFunction and compl lshift or rshift xor
" Getting Type Function
syn keyword awkFunction isarray
" Getting Type Functions
syn keyword awkFunction isarray typeof
" String-Translation Functions
syn keyword awkFunction bindtextdomain dcgettext dcngetext

syn keyword awkConditional if else
syn keyword awkRepeat while for
syn keyword awkRepeat while for do

syn keyword awkTodo contained TODO
syn keyword awkTodo contained TODO

syn keyword awkPatterns BEGIN END
syn keyword awkPatterns BEGIN END BEGINFILE ENDFILE

" GAWK ref. Chapter 7
" Built-in Variables That Control awk
Expand All @@ -74,20 +71,18 @@ syn keyword awkVariables ARGC ARGV ARGIND ENVIRON ERRNO FILENAME
syn keyword awkVariables FNR NF FUNCTAB NR PROCINFO RLENGTH RSTART
syn keyword awkVariables RT SYMTAB

syn keyword awkRepeat do

" Octal format character.
syn match awkSpecialCharacter display contained "\\[0-7]\{1,3\}"
syn keyword awkStatement func nextfile
" Hex format character.
syn match awkSpecialCharacter display contained "\\x[0-9A-Fa-f]\+"

syn match awkFieldVars "\$\d\+"

"catch errors caused by wrong parenthesis
syn region awkParen transparent start="(" end=")" contains=ALLBUT,awkParenError,awkSpecialCharacter,awkArrayElement,awkArrayArray,awkTodo,awkRegExp,awkBrktRegExp,awkBrackets,awkCharClass
" catch errors caused by wrong parenthesis
syn region awkParen transparent start="(" end=")" contains=ALLBUT,awkParenError,awkSpecialCharacter,awkArrayElement,awkArrayArray,awkTodo,awkRegExp,awkBrktRegExp,awkBrackets,awkCharClass,awkComment
syn match awkParenError display ")"
syn match awkInParen display contained "[{}]"
"syn match awkInParen display contained "[{}]"

" 64 lines for complex &&'s, and ||'s in a big "if"
syn sync ccomment awkParen maxlines=64
Expand Down Expand Up @@ -141,7 +136,7 @@ syn match awkExpression "?\|:"
syn keyword awkExpression in

" Boolean Logic (OR, AND, NOT)
"syn match awkBoolLogic "||\|&&\|\!"
syn match awkBoolLogic "||\|&&\|\!"

" This is overridden by less-than & greater-than.
" Put this above those to override them.
Expand Down Expand Up @@ -171,63 +166,42 @@ syn region awkArray transparent start="\[" end="\]" contains=awkArray,awkArrayE
" (for the few instances where it would be more than "oneline")
syn sync ccomment awkArray maxlines=10

" 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_awk_syn_inits")
if version < 508
let did_awk_syn_inits = 1
command -nargs=+ HiLink hi link <args>
else
command -nargs=+ HiLink hi def link <args>
endif

HiLink awkConditional Conditional
HiLink awkFunction Function
HiLink awkRepeat Repeat
HiLink awkStatement Statement

HiLink awkString String
HiLink awkSpecialPrintf Special
HiLink awkSpecialCharacter Special

HiLink awkSearch String
HiLink awkBrackets awkRegExp
HiLink awkBrktRegExp awkNestRegExp
HiLink awkCharClass awkNestRegExp
HiLink awkNestRegExp Keyword
HiLink awkRegExp Special

HiLink awkNumber Number
HiLink awkFloat Float

HiLink awkFileIO Special
HiLink awkOperator Special
HiLink awkExpression Special
HiLink awkBoolLogic Special

HiLink awkPatterns Special
HiLink awkVariables Special
HiLink awkFieldVars Special

HiLink awkLineSkip Special
HiLink awkSemicolon Special
HiLink awkComma Special
"HiLink awkIdentifier Identifier

HiLink awkComment Comment
HiLink awkTodo Todo

" Change this if you want nested array names to be highlighted.
HiLink awkArrayArray awkArray
HiLink awkArrayElement Special

HiLink awkParenError awkError
HiLink awkInParen awkError
HiLink awkError Error

delcommand HiLink
endif
" Define the default highlighting.
" Only used when an item doesn't have highlighting yet
hi def link awkConditional Conditional
hi def link awkFunction Function
hi def link awkRepeat Repeat
hi def link awkStatement Statement
hi def link awkString String
hi def link awkSpecialPrintf Special
hi def link awkSpecialCharacter Special
hi def link awkSearch String
hi def link awkBrackets awkRegExp
hi def link awkBrktRegExp awkNestRegExp
hi def link awkCharClass awkNestRegExp
hi def link awkNestRegExp Keyword
hi def link awkRegExp Special
hi def link awkNumber Number
hi def link awkFloat Float
hi def link awkFileIO Special
hi def link awkOperator Special
hi def link awkExpression Special
hi def link awkBoolLogic Special
hi def link awkPatterns Special
hi def link awkVariables Special
hi def link awkFieldVars Special
hi def link awkLineSkip Special
hi def link awkSemicolon Special
hi def link awkComma Special
hi def link awkIdentifier Identifier
hi def link awkComment Comment
hi def link awkTodo Todo
" Change this if you want nested array names to be highlighted.
hi def link awkArrayArray awkArray
hi def link awkArrayElement Special
hi def link awkParenError awkError
hi def link awkInParen awkError
hi def link awkError Error

let b:current_syntax = "awk"

Expand Down

0 comments on commit c91a0dc

Please sign in to comment.