GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 01:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.656

Browse Source 
Problem:    Missing changes for glob() in one file.
Solution:   Add the missing changes.

d8b77f7dc0
This commit is contained in:
Justin Gassner
2016-01-25 19:36:57 +01:00
parent 45b378259e
commit 299044d4ef
9 changed files with 427 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/doc/eval.txt
View File

@ -1862,10 +1862,10 @@ getwinposx() Number X coord in pixels of GUI Vim window
getwinposy() Number Y coord in pixels of GUI Vim window getwinposy() Number Y coord in pixels of GUI Vim window
getwinvar( {nr}, {varname} [, {def}]) getwinvar( {nr}, {varname} [, {def}])
any variable {varname} in window {nr} any variable {varname} in window {nr}
glob( {expr} [, {nosuf} [, {list}]]) glob( {expr} [, {nosuf} [, {list} [, {alllinks}]]])
any expand file wildcards in {expr} any expand file wildcards in {expr}
glob2regpat( {expr}) String convert a glob pat into a search pat glob2regpat( {expr}) String convert a glob pat into a search pat
globpath( {path}, {expr} [, {nosuf} [, {list}]]) globpath( {path}, {expr} [, {nosuf} [, {list} [, {alllinks}]]])
String do glob({expr}) for all dirs in {path} String do glob({expr}) for all dirs in {path}
has( {feature}) Number TRUE if feature {feature} supported has( {feature}) Number TRUE if feature {feature} supported
has_key( {dict}, {key}) Number TRUE if {dict} has entry {key} has_key( {dict}, {key}) Number TRUE if {dict} has entry {key}
@ -3754,7 +3754,7 @@ getwinvar({winnr}, {varname} [, {def}]) *getwinvar()*
:let list_is_on = getwinvar(2, '&list') :let list_is_on = getwinvar(2, '&list')
:echo "myvar = " . getwinvar(1, 'myvar') :echo "myvar = " . getwinvar(1, 'myvar')
< <
glob({expr} [, {nosuf} [, {list}]]) *glob()* glob({expr} [, {nosuf} [, {list} [, {alllinks}]]]) *glob()*
Expand the file wildcards in {expr}. See |wildcards| for the Expand the file wildcards in {expr}. See |wildcards| for the
use of special characters. use of special characters.
@ -3771,8 +3771,11 @@ glob({expr} [, {nosuf} [, {list}]]) *glob()*
matches, they are separated by <NL> characters. matches, they are separated by <NL> characters.
If the expansion fails, the result is an empty String or List. If the expansion fails, the result is an empty String or List.
A name for a non-existing file is not included. A symbolic A name for a non-existing file is not included. A symbolic
link is only included if it points to an existing file. link is only included if it points to an existing file.
However, when the {alllinks} argument is present and it is
non-zero then all symbolic links are included.
For most systems backticks can be used to get files names from For most systems backticks can be used to get files names from
any external command. Example: > any external command. Example: >
@ -3792,7 +3795,8 @@ glob2regpat({expr}) *glob2regpat()*
< This is equivalent to: > < This is equivalent to: >
if filename =~ '^Make.*\.mak$' if filename =~ '^Make.*\.mak$'
< <
globpath({path}, {expr} [, {nosuf} [, {list}]]) *globpath()* *globpath()*
globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])
Perform glob() on all directories in {path} and concatenate Perform glob() on all directories in {path} and concatenate
the results. Example: > the results. Example: >
:echo globpath(&rtp, "syntax/c.vim") :echo globpath(&rtp, "syntax/c.vim")
@ -3818,6 +3822,8 @@ globpath({path}, {expr} [, {nosuf} [, {list}]]) *globpath()*
they are separated by <NL> characters. Example: > they are separated by <NL> characters. Example: >
:echo globpath(&rtp, "syntax/c.vim", 0, 1) :echo globpath(&rtp, "syntax/c.vim", 0, 1)
< <
{allinks} is used as with |glob()|.
The "**" item can be used to search in a directory tree. The "**" item can be used to search in a directory tree.
For example, to find all "README.txt" files in the directories For example, to find all "README.txt" files in the directories
in 'runtimepath' and below: > in 'runtimepath' and below: >

41
runtime/indent/html.vim
View File

@ -245,6 +245,10 @@ call s:AddITags(s:indent_tags, [
\ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output', \ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output',
\ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video', \ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video',
\ 'wbr', 'text']) \ 'wbr', 'text'])
" Tags added for web components:
call s:AddITags(s:indent_tags, [
\ 'content', 'shadow', 'template'])
"}}} "}}}
" Add Block Tags: these contain alien content " Add Block Tags: these contain alien content
@ -287,7 +291,7 @@ func! s:CountITags(text)
let s:nextrel = 0 " relative indent steps for next line [unit &sw]: let s:nextrel = 0 " relative indent steps for next line [unit &sw]:
let s:block = 0 " assume starting outside of a block let s:block = 0 " assume starting outside of a block
let s:countonly = 1 " don't change state let s:countonly = 1 " don't change state
call substitute(a:text, '<\zs/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g') call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
let s:countonly = 0 let s:countonly = 0
endfunc "}}} endfunc "}}}
@ -299,7 +303,7 @@ func! s:CountTagsAndState(text)
let s:nextrel = 0 " relative indent steps for next line [unit &sw]: let s:nextrel = 0 " relative indent steps for next line [unit &sw]:
let s:block = b:hi_newstate.block let s:block = b:hi_newstate.block
let tmp = substitute(a:text, '<\zs/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g') let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
if s:block == 3 if s:block == 3
let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*')) let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
endif endif
@ -311,6 +315,9 @@ func! s:CheckTag(itag)
"{{{ "{{{
" Returns an empty string or "SCRIPT". " Returns an empty string or "SCRIPT".
" a:itag can be "tag" or "/tag" or "<!--" or "-->" " a:itag can be "tag" or "/tag" or "<!--" or "-->"
if (s:CheckCustomTag(a:itag))
return ""
endif
let ind = s:get_tag(a:itag) let ind = s:get_tag(a:itag)
if ind == -1 if ind == -1
" closing tag " closing tag
@ -365,6 +372,36 @@ func! s:CheckBlockTag(blocktag, ind)
return "" return ""
endfunc "}}} endfunc "}}}
" Used by s:CheckTag().
func! s:CheckCustomTag(ctag)
"{{{
" Returns 1 if ctag is the tag for a custom element, 0 otherwise.
" a:ctag can be "tag" or "/tag" or "<!--" or "-->"
let pattern = '\%\(\w\+-\)\+\w\+'
if match(a:ctag, pattern) == -1
return 0
endif
if matchstr(a:ctag, '\/\ze.\+') == "/"
" closing tag
if s:block != 0
" ignore ctag within a block
return 1
endif
if s:nextrel == 0
let s:curind -= 1
else
let s:nextrel -= 1
endif
else
" opening tag
if s:block != 0
return 1
endif
let s:nextrel += 1
endif
return 1
endfunc "}}}
" Return the <script> type: either "javascript" or "" " Return the <script> type: either "javascript" or ""
func! s:GetScriptType(str) func! s:GetScriptType(str)
"{{{ "{{{

22
runtime/syntax/c.vim
View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: C " Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2015 Feb 27 " Last Change: 2015 Mar 05
" Quit when a (custom) syntax file was already loaded " Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@ -47,16 +47,17 @@ if !exists("c_no_cformat")
endif endif
" cCppString: same as cString, but ends at end of line " cCppString: same as cString, but ends at end of line
if s:ft ==# "cpp" && !exists("cpp_no_cpp11") if s:ft ==# "cpp" && !exists("cpp_no_cpp11") && !exists("c_no_cformat")
" ISO C++11 " ISO C++11
syn region cString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend syn region cString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
syn region cCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell syn region cCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
elseif s:ft ==# "c" && !exists("c_no_c11") elseif s:ft ==# "c" && !exists("c_no_c11") && !exists("c_no_cformat")
" ISO C99 " ISO C99
syn region cString start=+\%(L\|U\|u8\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend syn region cString start=+\%(L\|U\|u8\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
syn region cCppString start=+\%(L\|U\|u8\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell syn region cCppString start=+\%(L\|U\|u8\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
else else
" older C or C++ " older C or C++
syn match cFormat display "%%" contained
syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
endif endif
@ -80,7 +81,11 @@ syn match cSpecialCharacter display "L'\\x\x\+'"
if (s:ft ==# "c" && !exists("c_no_c11")) || (s:ft ==# "cpp" && !exists("cpp_no_cpp11")) if (s:ft ==# "c" && !exists("c_no_c11")) || (s:ft ==# "cpp" && !exists("cpp_no_cpp11"))
" ISO C11 or ISO C++ 11 " ISO C11 or ISO C++ 11
syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend if exists("c_no_cformat")
syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
else
syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
endif
syn match cCharacter "[Uu]'[^\\]'" syn match cCharacter "[Uu]'[^\\]'"
syn match cCharacter "[Uu]'[^']*'" contains=cSpecial syn match cCharacter "[Uu]'[^']*'" contains=cSpecial
if exists("c_gnu") if exists("c_gnu")
@ -389,8 +394,13 @@ endif
syn cluster cLabelGroup contains=cUserLabel syn cluster cLabelGroup contains=cUserLabel
syn match cUserCont display "^\s*\I\i*\s*:$" contains=@cLabelGroup syn match cUserCont display "^\s*\I\i*\s*:$" contains=@cLabelGroup
syn match cUserCont display ";\s*\I\i*\s*:$" contains=@cLabelGroup syn match cUserCont display ";\s*\I\i*\s*:$" contains=@cLabelGroup
syn match cUserCont display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup if s:ft ==# 'cpp'
syn match cUserCont display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup syn match cUserCont display "^\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
syn match cUserCont display ";\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
else
syn match cUserCont display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
syn match cUserCont display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
endif
syn match cUserLabel display "\I\i*" contained syn match cUserLabel display "\I\i*" contained

15
runtime/syntax/cpp.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: C++ " Language: C++
" Current Maintainer: vim-jp (https://github.com/vim-jp/cpp-vim) " Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp)
" Previous Maintainer: Ken Shan <ccshan@post.harvard.edu> " Previous Maintainer: Ken Shan <ccshan@post.harvard.edu>
" Last Change: 2014 May 14 " Last Change: 2015 Mar 1
" 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
@ -32,14 +32,21 @@ syn match cppCast "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*$"
syn keyword cppStorageClass mutable syn keyword cppStorageClass mutable
syn keyword cppStructure class typename template namespace syn keyword cppStructure class typename template namespace
syn keyword cppBoolean true false syn keyword cppBoolean true false
syn keyword cppConstant __cplusplus
" C++ 11 extensions " C++ 11 extensions
if !exists("cpp_no_cpp11") if !exists("cpp_no_cpp11")
syn keyword cppType override final syn keyword cppType override final
syn keyword cppExceptions noexcept syn keyword cppExceptions noexcept
syn keyword cppStorageClass constexpr decltype syn keyword cppStorageClass constexpr decltype thread_local
syn keyword cppConstant nullptr syn keyword cppConstant nullptr
syn region cppRawString matchgroup=cppRawDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell syn keyword cppConstant ATOMIC_FLAG_INIT ATOMIC_VAR_INIT
syn keyword cppConstant ATOMIC_BOOL_LOCK_FREE ATOMIC_CHAR_LOCK_FREE
syn keyword cppConstant ATOMIC_CHAR16_T_LOCK_FREE ATOMIC_CHAR32_T_LOCK_FREE
syn keyword cppConstant ATOMIC_WCHAR_T_LOCK_FREE ATOMIC_SHORT_LOCK_FREE
syn keyword cppConstant ATOMIC_INT_LOCK_FREE ATOMIC_LONG_LOCK_FREE
syn keyword cppConstant ATOMIC_LLONG_LOCK_FREE ATOMIC_POINTER_LOCK_FREE
syn region cppRawString matchgroup=cppRawDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell
endif endif
" The minimum and maximum operators in GNU C++ " The minimum and maximum operators in GNU C++

11
runtime/syntax/upstreamdat.vim
View File

@ -1,13 +1,14 @@
" Vim syntax file " Vim syntax file
" Language: Innovation Data Processing upstream.dat file " Language: Innovation Data Processing upstream.dat file
" Maintainer: Rob Owens <rowens@fdrinnovation.com> " Maintainer: Rob Owens <rowens@fdrinnovation.com>
" Latest Revision: 2013-06-17 " Latest Revision: 2013-11-27
" 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")
finish finish
endif endif
" Parameters:
syn keyword upstreamdat_Parameter ACCEPTPCREMOTE syn keyword upstreamdat_Parameter ACCEPTPCREMOTE
syn keyword upstreamdat_Parameter ACCEPTREMOTE syn keyword upstreamdat_Parameter ACCEPTREMOTE
syn keyword upstreamdat_Parameter ACTION syn keyword upstreamdat_Parameter ACTION
@ -291,6 +292,14 @@ syn keyword upstreamdat_Parameter XFERECORDSIZE
syn keyword upstreamdat_Parameter XFERRECSEP syn keyword upstreamdat_Parameter XFERRECSEP
syn keyword upstreamdat_Parameter XFERRECUSECR syn keyword upstreamdat_Parameter XFERRECUSECR
" File Specs:
syn match upstreamdat_Filespec /file spec\c \d\{1,3}.*/
" Comments:
syn match upstreamdat_Comment /^#.*/
hi def link upstreamdat_Parameter Type hi def link upstreamdat_Parameter Type
"hi def link upstreamdat_Filespec Underlined
hi def link upstreamdat_Comment Comment
let b:current_syntax = "upstreamdat" let b:current_syntax = "upstreamdat"

310
runtime/syntax/upstreamrpt.vim Normal file
View File

@ -0,0 +1,310 @@
" Vim syntax file
" Language: Innovation Data Processing upstream.rpt file
" Maintainer: Rob Owens <rowens@fdrinnovation.com>
" Latest Revision: 2014-03-13
" Quit when a syntax file was already loaded
if exists("b:current_syntax")
finish
endif
setlocal foldmethod=syntax
" Parameters:
syn keyword upstreamdat_Parameter ACCEPTPCREMOTE
syn keyword upstreamdat_Parameter ACCEPTREMOTE
syn keyword upstreamdat_Parameter ACTION
syn keyword upstreamdat_Parameter ACTIVATEONENTRY
syn keyword upstreamdat_Parameter ARCHIVEBIT
syn keyword upstreamdat_Parameter ARCHIVEBIT
syn keyword upstreamdat_Parameter ASCTOEBC
syn keyword upstreamdat_Parameter ASRBACKUP
syn keyword upstreamdat_Parameter ATTENDED
syn keyword upstreamdat_Parameter AUTHORITATIVE
syn keyword upstreamdat_Parameter AUTHORITATIVERESTORE
syn keyword upstreamdat_Parameter AUTHORITATIVERESTORE
syn keyword upstreamdat_Parameter BACKUPPROFILE
syn keyword upstreamdat_Parameter BACKUPPROFILE2
syn keyword upstreamdat_Parameter BACKUPREPARSEFILES
syn keyword upstreamdat_Parameter BACKUPREPARSEFILES
syn keyword upstreamdat_Parameter BACKUPVERIFY
syn keyword upstreamdat_Parameter BLANKTRUNC
syn keyword upstreamdat_Parameter CALCDASDSIZE
syn keyword upstreamdat_Parameter CHANGEDIRATTRIBS
syn keyword upstreamdat_Parameter CHANGEDIRATTRIBS
syn keyword upstreamdat_Parameter COMPRESSLEVEL
syn keyword upstreamdat_Parameter CONTROLFILE
syn keyword upstreamdat_Parameter DASDOVERRIDE
syn keyword upstreamdat_Parameter DATELIMIT
syn keyword upstreamdat_Parameter DATELIMIT
syn keyword upstreamdat_Parameter DAYSOLD
syn keyword upstreamdat_Parameter DAYSOLD
syn keyword upstreamdat_Parameter DELETED
syn keyword upstreamdat_Parameter DELETED
syn keyword upstreamdat_Parameter DELETEPROMPTS
syn keyword upstreamdat_Parameter DELETEPROMPTS
syn keyword upstreamdat_Parameter DESTINATION
syn keyword upstreamdat_Parameter DESTINATION
syn keyword upstreamdat_Parameter DIRDELETE
syn keyword upstreamdat_Parameter DIRECTORVMC
syn keyword upstreamdat_Parameter DIRONLYRESTOREOK
syn keyword upstreamdat_Parameter DIRSONLY
syn keyword upstreamdat_Parameter DIRSONLY
syn keyword upstreamdat_Parameter DISASTERRECOVERY
syn keyword upstreamdat_Parameter DISPLAY
syn keyword upstreamdat_Parameter DRIVEALIAS
syn keyword upstreamdat_Parameter DRIVEALIAS
syn keyword upstreamdat_Parameter DUALCOPY
syn keyword upstreamdat_Parameter DUPDAYS
syn keyword upstreamdat_Parameter DUPLICATE
syn keyword upstreamdat_Parameter EBCTOASC
syn keyword upstreamdat_Parameter ENCRYPT
syn keyword upstreamdat_Parameter ENCRYPTLEVEL
syn keyword upstreamdat_Parameter EXCLUDELISTNAME
syn keyword upstreamdat_Parameter FAILBACKUPONERROR
syn keyword upstreamdat_Parameter FAILBACKUPONERROR
syn keyword upstreamdat_Parameter FAILIFNOFILES
syn keyword upstreamdat_Parameter FAILIFNOFILES
syn keyword upstreamdat_Parameter FAILIFSKIP
syn keyword upstreamdat_Parameter FAILJOB
syn keyword upstreamdat_Parameter FAILRESTOREONERROR
syn keyword upstreamdat_Parameter FAILRESTOREONERROR
syn keyword upstreamdat_Parameter FILEDATE
syn keyword upstreamdat_Parameter FILEDATE
syn keyword upstreamdat_Parameter FILEDELETE
syn keyword upstreamdat_Parameter FILEDELETE
syn keyword upstreamdat_Parameter FILES
syn keyword upstreamdat_Parameter FILES
syn keyword upstreamdat_Parameter FILESOPENFORUPDAT
syn keyword upstreamdat_Parameter FILESOPENFORUPDAT
syn keyword upstreamdat_Parameter FILETRANSFER
syn keyword upstreamdat_Parameter GETREMOTEFILES
syn keyword upstreamdat_Parameter HARDLINKDB
syn keyword upstreamdat_Parameter HARDLINKS
syn keyword upstreamdat_Parameter HARDLINKS
syn keyword upstreamdat_Parameter HIDDENFILES
syn keyword upstreamdat_Parameter HIDDENFILES
syn keyword upstreamdat_Parameter HOLDTAPE
syn keyword upstreamdat_Parameter HOLDUSERDIRS
syn keyword upstreamdat_Parameter HOSTFILENAME
syn keyword upstreamdat_Parameter HOSTRECORD
syn keyword upstreamdat_Parameter HOSTSORT
syn keyword upstreamdat_Parameter IGNOREPLUGINSFORRESTORE
syn keyword upstreamdat_Parameter INCRDB
syn keyword upstreamdat_Parameter INCRDBARCHIVEBIT
syn keyword upstreamdat_Parameter INCRDBDELETEDFILES
syn keyword upstreamdat_Parameter INCREMENTAL
syn keyword upstreamdat_Parameter INCREMENTAL
syn keyword upstreamdat_Parameter INQOPTIONS
syn keyword upstreamdat_Parameter INSTALLWIN2KAGENT
syn keyword upstreamdat_Parameter INSTALLWIN2KAGENT
syn keyword upstreamdat_Parameter JOBOPTIONS
syn keyword upstreamdat_Parameter JOBRETURNCODEMAP
syn keyword upstreamdat_Parameter JOBWAITTIMELIMIT
syn keyword upstreamdat_Parameter KEEPALIVE
syn keyword upstreamdat_Parameter LANINTERFACE
syn keyword upstreamdat_Parameter LANWSNAME
syn keyword upstreamdat_Parameter LANWSPASSWORD
syn keyword upstreamdat_Parameter LASTACCESS
syn keyword upstreamdat_Parameter LASTACCESS
syn keyword upstreamdat_Parameter LATESTDATE
syn keyword upstreamdat_Parameter LATESTDATE
syn keyword upstreamdat_Parameter LATESTTIME
syn keyword upstreamdat_Parameter LATESTTIME
syn keyword upstreamdat_Parameter LATESTVERSION
syn keyword upstreamdat_Parameter LINEBLOCK
syn keyword upstreamdat_Parameter LINETRUNC
syn keyword upstreamdat_Parameter LISTENFORREMOTE
syn keyword upstreamdat_Parameter LOCALBACKUP
syn keyword upstreamdat_Parameter LOCALBACKUPDIR
syn keyword upstreamdat_Parameter LOCALBACKUPMAX
syn keyword upstreamdat_Parameter LOCALBACKUPMAXFILESIZE
syn keyword upstreamdat_Parameter LOCALBACKUPMAXSIZE
syn keyword upstreamdat_Parameter LOCALEXCLUDEFILE
syn keyword upstreamdat_Parameter LOCALPARAMETERS
syn keyword upstreamdat_Parameter LOCALPASSWORD
syn keyword upstreamdat_Parameter LOCALRESTORE
syn keyword upstreamdat_Parameter LOCALUSER
syn keyword upstreamdat_Parameter LOFS
syn keyword upstreamdat_Parameter LOGNONFATAL
syn keyword upstreamdat_Parameter MAXBACKUPFILESFAIL
syn keyword upstreamdat_Parameter MAXBACKUPTIME
syn keyword upstreamdat_Parameter MAXDUPS
syn keyword upstreamdat_Parameter MAXFILENAMESIZE
syn keyword upstreamdat_Parameter MAXKFILESIZE
syn keyword upstreamdat_Parameter MAXLOGDAYS
syn keyword upstreamdat_Parameter MAXRESTOREFILESFAIL
syn keyword upstreamdat_Parameter MAXRESTORETIME
syn keyword upstreamdat_Parameter MAXRETRY
syn keyword upstreamdat_Parameter MAXRPTDAYS
syn keyword upstreamdat_Parameter MERGE
syn keyword upstreamdat_Parameter MIGRBITS
syn keyword upstreamdat_Parameter MIGRBITS
syn keyword upstreamdat_Parameter MINCOMPRESSSIZE
syn keyword upstreamdat_Parameter MINIMIZE
syn keyword upstreamdat_Parameter MODIFYFILE
syn keyword upstreamdat_Parameter MOUNTPOINTS
syn keyword upstreamdat_Parameter MOUNTPOINTS
syn keyword upstreamdat_Parameter NDS
syn keyword upstreamdat_Parameter NDS
syn keyword upstreamdat_Parameter NEWFILECOMPARE
syn keyword upstreamdat_Parameter NFSBELOW
syn keyword upstreamdat_Parameter NODATAOK
syn keyword upstreamdat_Parameter NODIRFORINCREMENTAL
syn keyword upstreamdat_Parameter NODIRFORINCREMENTAL
syn keyword upstreamdat_Parameter NONFILEDATABITMAP
syn keyword upstreamdat_Parameter NONFILEDATABITMAP
syn keyword upstreamdat_Parameter NOPOINTRESTORE
syn keyword upstreamdat_Parameter NOSPECINHERITANCE
syn keyword upstreamdat_Parameter NOTIFYEVENTS
syn keyword upstreamdat_Parameter NOTIFYFAILUREATTACHMENT
syn keyword upstreamdat_Parameter NOTIFYSUCCESSATTACHMENT
syn keyword upstreamdat_Parameter NOTIFYTARGETS
syn keyword upstreamdat_Parameter NOUIDGIDNAMES
syn keyword upstreamdat_Parameter NOUIDGIDNAMES
syn keyword upstreamdat_Parameter NOVELLMIGRATE
syn keyword upstreamdat_Parameter NOVELLMIGRATE
syn keyword upstreamdat_Parameter NOVELLMIGRATEADDEXT
syn keyword upstreamdat_Parameter NOVELLMIGRATEADDEXT
syn keyword upstreamdat_Parameter NOVELLPROFILE
syn keyword upstreamdat_Parameter NOVELLRECALL
syn keyword upstreamdat_Parameter NTFSADDPERMISSION
syn keyword upstreamdat_Parameter NTFSADDPERMISSION
syn keyword upstreamdat_Parameter NTREGRESTORE
syn keyword upstreamdat_Parameter OSTYPE
syn keyword upstreamdat_Parameter OUTPORT
syn keyword upstreamdat_Parameter PACKFLUSHAFTERFILE
syn keyword upstreamdat_Parameter PACKRECSIZE
syn keyword upstreamdat_Parameter PARAMETER
syn keyword upstreamdat_Parameter PASSWORD
syn keyword upstreamdat_Parameter PATHNAME
syn keyword upstreamdat_Parameter PATHNAME
syn keyword upstreamdat_Parameter PERFORMBITMAP
syn keyword upstreamdat_Parameter PERFORMNUMRECORDS
syn keyword upstreamdat_Parameter PERFORMRECORDSIZE
syn keyword upstreamdat_Parameter PLUGIN
syn keyword upstreamdat_Parameter PLUGIN
syn keyword upstreamdat_Parameter PLUGINPARAMETERS
syn keyword upstreamdat_Parameter PLUGINPARAMETERS
syn keyword upstreamdat_Parameter POSTJOB
syn keyword upstreamdat_Parameter PREJOB
syn keyword upstreamdat_Parameter PRTYCLASS
syn keyword upstreamdat_Parameter PRTYLEVEL
syn keyword upstreamdat_Parameter RECALLCLEANUP
syn keyword upstreamdat_Parameter RECALLOFFLINEFILES
syn keyword upstreamdat_Parameter RECALLOFFLINEFILES
syn keyword upstreamdat_Parameter RECORDSIZE
syn keyword upstreamdat_Parameter REMOTEADDR
syn keyword upstreamdat_Parameter REMOTEAPPLPREF
syn keyword upstreamdat_Parameter REMOTEAPPLRETRY
syn keyword upstreamdat_Parameter REMOTECONNECTTYPE
syn keyword upstreamdat_Parameter REMOTEFLAGS
syn keyword upstreamdat_Parameter REMOTEIPADAPTER
syn keyword upstreamdat_Parameter REMOTELOCALPARAMETERS
syn keyword upstreamdat_Parameter REMOTELOGMODE
syn keyword upstreamdat_Parameter REMOTELUNAME
syn keyword upstreamdat_Parameter REMOTEMAXRETRIES
syn keyword upstreamdat_Parameter REMOTEMODENAME
syn keyword upstreamdat_Parameter REMOTEPARAMETERFILE
syn keyword upstreamdat_Parameter REMOTEPORT
syn keyword upstreamdat_Parameter REMOTEREQUEST
syn keyword upstreamdat_Parameter REMOTERESTART
syn keyword upstreamdat_Parameter REMOTEROUTE
syn keyword upstreamdat_Parameter REMOTETARGETNAME
syn keyword upstreamdat_Parameter REMOTETCP
syn keyword upstreamdat_Parameter REMOTETIMEOUT
syn keyword upstreamdat_Parameter REMOTETMAXRETRY
syn keyword upstreamdat_Parameter REMOTETPN
syn keyword upstreamdat_Parameter REMOTEUSAPPL
syn keyword upstreamdat_Parameter REMOTEVERIFY
syn keyword upstreamdat_Parameter REMOTEWTOCOMP
syn keyword upstreamdat_Parameter REPORTNAME
syn keyword upstreamdat_Parameter REPORTOPTIONS
syn keyword upstreamdat_Parameter RESTARTLASTFILE
syn keyword upstreamdat_Parameter RESTART
syn keyword upstreamdat_Parameter RESTARTTYPE
syn keyword upstreamdat_Parameter RESTARTVERSIONDATE
syn keyword upstreamdat_Parameter RESTOREARCHIVEBIT
syn keyword upstreamdat_Parameter RESTORECHECKPOINT
syn keyword upstreamdat_Parameter RESTOREDATELIMIT
syn keyword upstreamdat_Parameter RESTOREDATELIMIT
syn keyword upstreamdat_Parameter RESTOREFILEFAIL
syn keyword upstreamdat_Parameter RESTOREMOUNTPOINTS
syn keyword upstreamdat_Parameter RESTOREMOUNTPOINTS
syn keyword upstreamdat_Parameter RESTORESEGMENTS
syn keyword upstreamdat_Parameter RESTORESEGMENTS
syn keyword upstreamdat_Parameter RESTORETODIFFFS
syn keyword upstreamdat_Parameter RETAIN
syn keyword upstreamdat_Parameter RETAIN
syn keyword upstreamdat_Parameter ROOTENTRY
syn keyword upstreamdat_Parameter ROOTENTRY
syn keyword upstreamdat_Parameter SAN
syn keyword upstreamdat_Parameter SCHEDULENAME
syn keyword upstreamdat_Parameter SEGMENTEDFILESIZE
syn keyword upstreamdat_Parameter SEGMENTEDFILESIZE
syn keyword upstreamdat_Parameter SEGMENTSIZE
syn keyword upstreamdat_Parameter SEGMENTSIZE
syn keyword upstreamdat_Parameter SENDHOSTDETAILS
syn keyword upstreamdat_Parameter SINGLEFS
syn keyword upstreamdat_Parameter SIZETRC
syn keyword upstreamdat_Parameter SKIP
syn keyword upstreamdat_Parameter SKIPBACKUPSCAN
syn keyword upstreamdat_Parameter SKIPOLD
syn keyword upstreamdat_Parameter SKIPOLD
syn keyword upstreamdat_Parameter SMSTARGETSERVICENAME
syn keyword upstreamdat_Parameter SMSTSA
syn keyword upstreamdat_Parameter SOLO
syn keyword upstreamdat_Parameter SORTBACKUP
syn keyword upstreamdat_Parameter SOSDISK
syn keyword upstreamdat_Parameter SOSDISK
syn keyword upstreamdat_Parameter SOSTIMESTAMP
syn keyword upstreamdat_Parameter SOSTIMESTAMP
syn keyword upstreamdat_Parameter SOSTIMESTAMPPATH
syn keyword upstreamdat_Parameter SOSTIMESTAMPPATH
syn keyword upstreamdat_Parameter SPECNUMBER
syn keyword upstreamdat_Parameter SPECNUMBER
syn keyword upstreamdat_Parameter SPECTYPE
syn keyword upstreamdat_Parameter SPECTYPE
syn keyword upstreamdat_Parameter STARTTIME
syn keyword upstreamdat_Parameter STORAGETYPE
syn keyword upstreamdat_Parameter SUBDIRECTORIES
syn keyword upstreamdat_Parameter SUBDIRECTORIES
syn keyword upstreamdat_Parameter SWITCHTOTAPEMB
syn keyword upstreamdat_Parameter TCPADDRESS
syn keyword upstreamdat_Parameter TCPTIMEOUT
syn keyword upstreamdat_Parameter TIMEOVERRIDE
syn keyword upstreamdat_Parameter TRACE
syn keyword upstreamdat_Parameter TRANSLATE
syn keyword upstreamdat_Parameter ULTRACOMP
syn keyword upstreamdat_Parameter ULTREG
syn keyword upstreamdat_Parameter ULTUPD
syn keyword upstreamdat_Parameter UNCMACHINEALIAS
syn keyword upstreamdat_Parameter UNCMACHINEALIAS
syn keyword upstreamdat_Parameter USEALEBRA
syn keyword upstreamdat_Parameter USECONTROLFILE
syn keyword upstreamdat_Parameter USEGID
syn keyword upstreamdat_Parameter USERID
syn keyword upstreamdat_Parameter USEUID
syn keyword upstreamdat_Parameter USNOUIDGIDERRORS
syn keyword upstreamdat_Parameter UTF8
syn keyword upstreamdat_Parameter VAULTNUMBER
syn keyword upstreamdat_Parameter VERSIONDATE
syn keyword upstreamdat_Parameter WRITESPARSE
syn keyword upstreamdat_Parameter XFERECORDSIZE
syn keyword upstreamdat_Parameter XFERRECSEP
syn keyword upstreamdat_Parameter XFERRECUSECR
" File Specs:
syn match upstreamdat_Filespec /file spec\c \d\{1,3}.*/
" Comments:
syn match upstreamdat_Comment /^#.*/
" List Of Parameters:
syn region upstreamdat_Parms start="Current Parameters:" end="End Of Parameters" transparent fold
hi def link upstreamdat_Parameter Type
"hi def link upstreamdat_Filespec Underlined
hi def link upstreamdat_Comment Comment
let b:current_syntax = "upstreamdat"

10
runtime/syntax/usw2kagtlog.vim
View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: Innovation Data Processing USW2KAgt.log file " Language: Innovation Data Processing USW2KAgt.log file
" Maintainer: Rob Owens <rowens@fdrinnovation.com> " Maintainer: Rob Owens <rowens@fdrinnovation.com>
" Latest Revision: 2013-09-19 " Latest Revision: 2014-04-01
" 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")
@ -17,8 +17,12 @@ syn match usw2kagtlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usw2kagtlo
syn match usw2kagtlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usw2kagtlog_Process skipwhite syn match usw2kagtlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usw2kagtlog_Process skipwhite
" Processes: " Processes:
syn region usw2kagtlog_Process start="(" end=")" contained syn region usw2kagtlog_Process start="(" end=")" contained
syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client request" "syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client request"
syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client request" "syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client request"
"syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client\s\{0,1}\r\{0,1}\s\{1,9}request"
"syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client\s\{0,1}\r\{0,1}\s\{1,9}request"
syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client"
syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client"
" IP Address: " IP Address:
syn match usw2kagtlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/ syn match usw2kagtlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
" Profile: " Profile:

39
src/nvim/path.c
View File

@ -681,11 +681,16 @@ static size_t do_path_expand(garray_T *gap, const char_u *path,
/* remove backslashes for the remaining components only */ /* remove backslashes for the remaining components only */
(void)do_path_expand(gap, buf, len + 1, flags, false); (void)do_path_expand(gap, buf, len + 1, flags, false);
} else { } else {
/* no more wildcards, check if there is a match */ FileInfo file_info;
/* remove backslashes for the remaining components only */
if (*path_end != NUL) // no more wildcards, check if there is a match
// remove backslashes for the remaining components only
if (*path_end != NUL) {
backslash_halve(buf + len + 1); backslash_halve(buf + len + 1);
if (os_file_exists(buf)) { /* add existing file */ }
// add existing file or symbolic link
if ((flags & EW_ALLLINKS) ? os_fileinfo_link((char *)buf, &file_info)
: os_file_exists(buf)) {
addfile(gap, buf, flags); addfile(gap, buf, flags);
} }
} }
@ -1294,26 +1299,28 @@ expand_backtick (
return cnt; return cnt;
} }
/* // Add a file to a file list. Accepted flags:
* Add a file to a file list. Accepted flags: // EW_DIR add directories
* EW_DIR add directories // EW_FILE add files
* EW_FILE add files // EW_EXEC add executable files
* EW_EXEC add executable files // EW_NOTFOUND add even when it doesn't exist
* EW_NOTFOUND add even when it doesn't exist // EW_ADDSLASH add slash after directory name
* EW_ADDSLASH add slash after directory name // EW_ALLLINKS add symlink also when the referred file does not exist
*/ void addfile(
void
addfile (
garray_T *gap, garray_T *gap,
char_u *f, /* filename */ char_u *f, /* filename */
int flags int flags
) )
{ {
bool isdir; bool isdir;
FileInfo file_info;
/* if the file/dir doesn't exist, may not add it */ // if the file/dir/link doesn't exist, may not add it
if (!(flags & EW_NOTFOUND) && !os_file_exists(f)) if (!(flags & EW_NOTFOUND) &&
((flags & EW_ALLLINKS) ?
!os_fileinfo_link((char *)f, &file_info) : !os_file_exists(f))) {
return; return;
}
#ifdef FNAME_ILLEGAL #ifdef FNAME_ILLEGAL
/* if the file/dir contains illegal characters, don't add it */ /* if the file/dir contains illegal characters, don't add it */

2
src/nvim/version.c
View File

@ -468,7 +468,7 @@ static int included_patches[] = {
659, 659,
658, 658,
// 657 NA // 657 NA
// 656, 656,
655, 655,
654, 654,
653, 653,