thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

Update version 8.2 notes and make syntax.

Browse Source
This commit is contained in:
Bram Moolenaar
2019-12-04 20:43:03 +01:00
parent 42e931b0f5
commit 9834b96820
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/doc/version8.txt
View File

@@ -1,4 +1,4 @@
*version8.txt* For Vim version 8.1. Last change: 2019 Dec 03 *version8.txt* For Vim version 8.1. Last change: 2019 Dec 04
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -25807,7 +25807,7 @@ VERSION 8.2 IS NOT RELEASED YET! THIS SECTION WILL CHANGE.
This section is about improvements made between version 8.1 and 8.2. This section is about improvements made between version 8.1 and 8.2.
This release has hundreds of bug fixes, there are sevearl new features and This release has hundreds of bug fixes, there are several new features and
there are many minor improvements. there are many minor improvements.
@@ -25824,6 +25824,9 @@ absolute position or just in the middle of the screen. The size can be fixed
or adjust to the text. A "zindex" value specifies what popup window goes on or adjust to the text. A "zindex" value specifies what popup window goes on
top of others. top of others.
The new 'wincolor' option allows for setting the color for the whole popup
window. This also works for normal windows.
Text properties *new-text-properties* Text properties *new-text-properties*
--------------- ---------------
@@ -25862,8 +25865,8 @@ The |Blob| type was added. This makes it easy to deal with binary data.
The /= and %= assignment operators were added. The /= and %= assignment operators were added.
A Dictionary can be defined with #{} where the keys are used literally. This A Dictionary can be defined with literal keys using #{}. This avoids having
avoids having to use quotes: > to use quotes: >
let options = #{width: 30, height: 24} let options = #{width: 30, height: 24}

21
runtime/syntax/make.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name> " Maintainer: Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>
" Previous Maintainer: Claudio Fleiner <claudio@fleiner.com> " Previous Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: https://github.com/vim/vim/syntax/make.vim " URL: https://github.com/vim/vim/syntax/make.vim
" Last Change: 2019 Apr 02 " Last Change: 2019 Dec 04
" quit when a syntax file was already loaded " quit when a syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@@ -20,7 +20,7 @@ syn match makeNextLine "\\\n\s*"
" some directives " some directives
syn match makePreCondit "^ *\(ifn\=\(eq\|def\)\>\|else\(\s\+ifn\=\(eq\|def\)\)\=\>\|endif\>\)" syn match makePreCondit "^ *\(ifn\=\(eq\|def\)\>\|else\(\s\+ifn\=\(eq\|def\)\)\=\>\|endif\>\)"
syn match makeInclude "^ *[-s]\=include" syn match makeInclude "^ *[-s]\=include\s.*$"
syn match makeStatement "^ *vpath" syn match makeStatement "^ *vpath"
syn match makeExport "^ *\(export\|unexport\)\>" syn match makeExport "^ *\(export\|unexport\)\>"
syn match makeOverride "^ *override" syn match makeOverride "^ *override"
@@ -32,13 +32,13 @@ syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains
" Microsoft Makefile specials " Microsoft Makefile specials
syn case ignore syn case ignore
syn match makeInclude "^!\s*include" syn match makeInclude "^!\s*include\s.*$"
syn match makePreCondit "^!\s*\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|else\s*if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>" syn match makePreCondit "^!\s*\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|else\s*if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>"
syn case match syn case match
" identifiers " identifiers
syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent,makeSString,makeDString syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent
syn region makeIdent start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeSString,makeDString syn region makeIdent start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent
syn match makeIdent "\$\$\w*" syn match makeIdent "\$\$\w*"
syn match makeIdent "\$[^({]" syn match makeIdent "\$[^({]"
syn match makeIdent "^ *[^:#= \t]*\s*[:+?!*]="me=e-2 syn match makeIdent "^ *[^:#= \t]*\s*[:+?!*]="me=e-2
@@ -49,11 +49,10 @@ syn match makeIdent "%"
syn match makeConfig "@[A-Za-z0-9_]\+@" syn match makeConfig "@[A-Za-z0-9_]\+@"
" make targets " make targets
" syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>" syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1
syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2
syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource
syn region makeTarget transparent matchgroup=makeTarget start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands syn region makeTarget transparent matchgroup=makeTarget start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment,makeDString skipnl nextGroup=makeCommands
syn match makeTarget "^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget,makeComment skipnl nextgroup=makeCommands,makeCommandError syn match makeTarget "^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget,makeComment skipnl nextgroup=makeCommands,makeCommandError
syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
@@ -84,8 +83,8 @@ syn keyword makeTodo TODO FIXME XXX contained
syn match makeEscapedChar "\\[^$]" syn match makeEscapedChar "\\[^$]"
syn region makeDString start=+\(\\\)\@<!"+ skip=+\\.+ end=+"+ contains=makeIdent syn region makeDString start=+\(\\\)\@<!"+ skip=+\\.+ end=+"+ contained contains=makeIdent
syn region makeSString start=+\(\\\)\@<!'+ skip=+\\.+ end=+'+ contains=makeIdent syn region makeSString start=+\(\\\)\@<!'+ skip=+\\.+ end=+'+ contained contains=makeIdent
syn region makeBString start=+\(\\\)\@<!`+ skip=+\\.+ end=+`+ contains=makeIdent,makeSString,makeDString,makeNextLine syn region makeBString start=+\(\\\)\@<!`+ skip=+\\.+ end=+`+ contains=makeIdent,makeSString,makeDString,makeNextLine
" Syncing " Syncing