From: Bram Moolenaar Date: Wed, 4 Dec 2019 19:43:03 +0000 (+0100) Subject: Update version 8.2 notes and make syntax. X-Git-Tag: v8.1.2387~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9834b96820bec95d6858229d6fb256310365efff;p=vim Update version 8.2 notes and make syntax. --- diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt index 56dce9f08..23f3cbffa 100644 --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -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 @@ -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 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. @@ -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 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* --------------- @@ -25862,8 +25865,8 @@ The |Blob| type was added. This makes it easy to deal with binary data. The /= and %= assignment operators were added. -A Dictionary can be defined with #{} where the keys are used literally. This -avoids having to use quotes: > +A Dictionary can be defined with literal keys using #{}. This avoids having +to use quotes: > let options = #{width: 30, height: 24} diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim index 377e4450d..62a591a82 100644 --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -3,7 +3,7 @@ " Maintainer: Roland Hieber " Previous Maintainer: Claudio Fleiner " 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 if exists("b:current_syntax") @@ -20,7 +20,7 @@ syn match makeNextLine "\\\n\s*" " some directives 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 makeExport "^ *\(export\|unexport\)\>" syn match makeOverride "^ *override" @@ -32,13 +32,13 @@ syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains " Microsoft Makefile specials 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 case match " identifiers -syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent,makeSString,makeDString -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 syn match makeIdent "\$\$\w*" syn match makeIdent "\$[^({]" syn match makeIdent "^ *[^:#= \t]*\s*[:+?!*]="me=e-2 @@ -49,11 +49,10 @@ syn match makeIdent "%" syn match makeConfig "@[A-Za-z0-9_]\+@" " 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 nextgroup=makeSource -syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource +syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 +syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 -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 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 region makeDString start=+\(\\\)\@