vim-patch:063b9d1

Updated runtime files.

063b9d15ab
This commit is contained in:
James McCoy 2017-02-01 15:58:52 -05:00
parent 5752bfb224
commit 8c09dbf082
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
9 changed files with 99 additions and 57 deletions

View File

@ -3095,7 +3095,10 @@ execute({command} [, {silent}]) *execute()*
The default is 'silent'. Note that with "silent!", unlike The default is 'silent'. Note that with "silent!", unlike
`:redir`, error messages are dropped. `:redir`, error messages are dropped.
This function is not available in the |sandbox|. To get a list of lines use |split()| on the result: >
split(execute('args'), "\n")
< This function is not available in the |sandbox|.
Note: If nested, an outer execute() will not observe output of Note: If nested, an outer execute() will not observe output of
the inner calls. the inner calls.
Note: Text attributes (highlights) are not captured. Note: Text attributes (highlights) are not captured.

View File

@ -1,4 +1,4 @@
*map.txt* For Vim version 7.4. Last change: 2016 Jun 10 *map.txt* For Vim version 7.4. Last change: 2016 Jul 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -1268,6 +1268,7 @@ completion can be enabled:
-complete=mapping mapping name -complete=mapping mapping name
-complete=menu menus -complete=menu menus
-complete=option options -complete=option options
-complete=packadd optional package |pack-add| names
-complete=shellcmd Shell command -complete=shellcmd Shell command
-complete=sign |:sign| suboptions -complete=sign |:sign| suboptions
-complete=syntax syntax file names |'syntax'| -complete=syntax syntax file names |'syntax'|

View File

@ -5200,10 +5200,10 @@ A jump table for the options with a short description can be found at |Q_op|.
has been used since the last search command. has been used since the last search command.
*shada-n* *shada-n*
n Name of the shada file. The name must immediately follow n Name of the shada file. The name must immediately follow
the 'n'. Must be the last one! If the "-i" argument was the 'n'. Must be at the end of the option! If the "-i"
given when starting Vim, that file name overrides the one argument was given when starting Vim, that file name overrides
given here with 'shada'. Environment variables are expanded the one given here with 'shada'. Environment variables are
when opening the file, not when setting the option. expanded when opening the file, not when setting the option.
*shada-r* *shada-r*
r Removable media. The argument is a string (up to the next r Removable media. The argument is a string (up to the next
','). This parameter can be given several times. Each ','). This parameter can be given several times. Each

View File

@ -1,4 +1,4 @@
*starting.txt* For Vim version 7.4. Last change: 2016 Jun 15 *starting.txt* For Vim version 7.4. Last change: 2016 Jul 03
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

View File

@ -611,6 +611,7 @@ String manipulation: *string-functions*
byteidxcomp() like byteidx() but count composing characters byteidxcomp() like byteidx() but count composing characters
repeat() repeat a string multiple times repeat() repeat a string multiple times
eval() evaluate a string expression eval() evaluate a string expression
execute() execute an Ex command and get the output
List manipulation: *list-functions* List manipulation: *list-functions*
get() get an item without error for wrong index get() get an item without error for wrong index
@ -944,12 +945,13 @@ Various: *various-functions*
shiftwidth() effective value of 'shiftwidth' shiftwidth() effective value of 'shiftwidth'
wordcount() get byte/word/char count of buffer
taglist() get list of matching tags taglist() get list of matching tags
tagfiles() get a list of tags files tagfiles() get a list of tags files
py3eval() evaluate Python expression (|+python3|) py3eval() evaluate Python expression (|+python3|)
pyeval() evaluate Python expression (|+python|) pyeval() evaluate Python expression (|+python|)
wordcount() get byte/word/char count of buffer
============================================================================== ==============================================================================
*41.7* Defining a function *41.7* Defining a function

View File

@ -1,4 +1,4 @@
*various.txt* For Vim version 7.4. Last change: 2016 Mar 20 *various.txt* For Vim version 7.4. Last change: 2016 Jul 09
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -416,9 +416,12 @@ m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support|
shown on the screen. When [!] is included, an shown on the screen. When [!] is included, an
existing file is overwritten. When [!] is omitted, existing file is overwritten. When [!] is omitted,
and {file} exists, this command fails. and {file} exists, this command fails.
Only one ":redir" can be active at a time. Calls to Only one ":redir" can be active at a time. Calls to
":redir" will close any active redirection before ":redir" will close any active redirection before
starting redirection to the new target. starting redirection to the new target. For recursive
use check out |execute()|.
To stop the messages and commands from being echoed to To stop the messages and commands from being echoed to
the screen, put the commands in a function and call it the screen, put the commands in a function and call it
with ":silent call Function()". with ":silent call Function()".
@ -456,6 +459,8 @@ m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support|
redirection starts, if the variable is removed or redirection starts, if the variable is removed or
locked or the variable type is changed, then further locked or the variable type is changed, then further
command output messages will cause errors. command output messages will cause errors.
To get the output of one command the |execute()|
function can be used.
:redi[r] =>> {var} Append messages to an existing variable. Only string :redi[r] =>> {var} Append messages to an existing variable. Only string
variables can be used. variables can be used.

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: 2016 Apr 10 " Last Change: 2016 Jul 07
" 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")
@ -295,7 +295,7 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
syn keyword cConstant SCHAR_MIN SINT_MIN SLONG_MIN SSHRT_MIN syn keyword cConstant SCHAR_MIN SINT_MIN SLONG_MIN SSHRT_MIN
syn keyword cConstant SCHAR_MAX SINT_MAX SLONG_MAX SSHRT_MAX syn keyword cConstant SCHAR_MAX SINT_MAX SLONG_MAX SSHRT_MAX
if !exists("c_no_c99") if !exists("c_no_c99")
syn keyword cConstant __func__ syn keyword cConstant __func__ __VA_ARGS__
syn keyword cConstant LLONG_MIN LLONG_MAX ULLONG_MAX syn keyword cConstant LLONG_MIN LLONG_MAX ULLONG_MAX
syn keyword cConstant INT8_MIN INT16_MIN INT32_MIN INT64_MIN syn keyword cConstant INT8_MIN INT16_MIN INT32_MIN INT64_MIN
syn keyword cConstant INT8_MAX INT16_MAX INT32_MAX INT64_MAX syn keyword cConstant INT8_MAX INT16_MAX INT32_MAX INT64_MAX

View File

@ -2,7 +2,7 @@
" Language: C++ " Language: C++
" Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp) " 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: 2015 Nov 10 " Last Change: 2016 Jul 07
" 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
@ -80,6 +80,7 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
HiLink cppConstant Constant HiLink cppConstant Constant
HiLink cppRawStringDelimiter Delimiter HiLink cppRawStringDelimiter Delimiter
HiLink cppRawString String HiLink cppRawString String
HiLink cppNumber Number
delcommand HiLink delcommand HiLink
endif endif

View File

@ -2,30 +2,22 @@
" Language: OpenBSD packet filter configuration (pf.conf) " Language: OpenBSD packet filter configuration (pf.conf)
" Original Author: Camiel Dobbelaar <cd@sentia.nl> " Original Author: Camiel Dobbelaar <cd@sentia.nl>
" Maintainer: Lauri Tirkkonen <lotheac@iki.fi> " Maintainer: Lauri Tirkkonen <lotheac@iki.fi>
" Last Change: 2013 Apr 02 " Last Change: 2016 Jul 06
" For version 5.x: Clear all syntax items if exists("b:current_syntax")
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
syntax clear
elseif exists("b:current_syntax")
finish finish
endif endif
setlocal foldmethod=syntax setlocal foldmethod=syntax
syn iskeyword @,48-57,_,-,+
syn sync fromstart syn sync fromstart
syn cluster pfNotLS contains=pfTodo,pfVarAssign syn cluster pfNotLS contains=pfTodo,pfVarAssign
syn keyword pfCmd altq anchor antispoof binat nat pass syn keyword pfCmd anchor antispoof block include match pass queue
syn keyword pfCmd queue rdr scrub table set syn keyword pfCmd queue set table
syn keyword pfService auth bgp domain finger ftp http https ident syn match pfCmd /^\s*load\sanchor\>/
syn keyword pfService imap irc isakmp kerberos mail nameserver nfs
syn keyword pfService nntp ntp pop3 portmap pptp rpcbind rsync smtp
syn keyword pfService snmp snmptrap socks ssh sunrpc syslog telnet
syn keyword pfService tftp www
syn keyword pfTodo TODO XXX contained syn keyword pfTodo TODO XXX contained
syn keyword pfWildAddr all any syn keyword pfWildAddr all any
syn match pfCmd /block\s/
syn match pfComment /#.*$/ contains=pfTodo syn match pfComment /#.*$/ contains=pfTodo
syn match pfCont /\\$/ syn match pfCont /\\$/
syn match pfErrClose /}/ syn match pfErrClose /}/
@ -34,43 +26,81 @@ syn match pfIPv6 /[a-fA-F0-9:]*::[a-fA-F0-9:.]*/
syn match pfIPv6 /[a-fA-F0-9:]\+:[a-fA-F0-9:]\+:[a-fA-F0-9:.]\+/ syn match pfIPv6 /[a-fA-F0-9:]\+:[a-fA-F0-9:]\+:[a-fA-F0-9:.]\+/
syn match pfNetmask /\/\d\+/ syn match pfNetmask /\/\d\+/
syn match pfNum /[a-zA-Z0-9_:.]\@<!\d\+[a-zA-Z0-9_:.]\@!/ syn match pfNum /[a-zA-Z0-9_:.]\@<!\d\+[a-zA-Z0-9_:.]\@!/
syn match pfTable /<\s*[a-zA-Z][a-zA-Z0-9_]*\s*>/ syn match pfTable /<\s*[a-zA-Z0-9_:][a-zA-Z0-9_:.-]*\s*>/
syn match pfVar /$[a-zA-Z][a-zA-Z0-9_]*/ syn match pfVar /$[a-zA-Z][a-zA-Z0-9_]*/
syn match pfVarAssign /^\s*[a-zA-Z][a-zA-Z0-9_]*\s*=/me=e-1 syn match pfVarAssign /^\s*[a-zA-Z][a-zA-Z0-9_]*\s*=/me=e-1
syn region pfFold1 start=/^#\{1}>/ end=/^#\{1,3}>/me=s-1 transparent fold syn region pfFold1 start=/^#\{1}>/ end=/^#\{1,3}>/me=s-1 transparent fold
syn region pfFold2 start=/^#\{2}>/ end=/^#\{2,3}>/me=s-1 transparent fold syn region pfFold2 start=/^#\{2}>/ end=/^#\{2,3}>/me=s-1 transparent fold
syn region pfFold3 start=/^#\{3}>/ end=/^#\{3}>/me=s-1 transparent fold syn region pfFold3 start=/^#\{3}>/ end=/^#\{3}>/me=s-1 transparent fold
syn region pfList start=/{/ end=/}/ transparent contains=ALLBUT,pfErrClose,@pfNotLS syn region pfList start=/{/ end=/}/ transparent contains=ALLBUT,pfErrClose,@pfNotLS
syn region pfString start=/"/ end=/"/ transparent contains=ALLBUT,pfString,@pfNotLS syn region pfString start=/"/ skip=/\\"/ end=/"/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar
syn region pfString start=/'/ end=/'/ transparent contains=ALLBUT,pfString,@pfNotLS syn region pfString start=/'/ skip=/\\'/ end=/'/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar
" Define the default highlighting. syn keyword pfService 802-11-iapp Microsoft-SQL-Monitor
" For version 5.7 and earlier: only when not done already syn keyword pfService Microsoft-SQL-Server NeXTStep NextStep
" For version 5.8 and later: only when an item doesn't have highlighting yet syn keyword pfService afpovertcp afs3-bos afs3-callback afs3-errors
if version >= 508 || !exists("did_c_syn_inits") syn keyword pfService afs3-fileserver afs3-kaserver afs3-prserver
if version < 508 syn keyword pfService afs3-rmtsys afs3-update afs3-vlserver
let did_c_syn_inits = 1 syn keyword pfService afs3-volser amt-redir-tcp amt-redir-tls
command -nargs=+ HiLink hi link <args> syn keyword pfService amt-soap-http amt-soap-https asf-rmcp at-echo
else syn keyword pfService at-nbp at-rtmp at-zis auth authentication
command -nargs=+ HiLink hi def link <args> syn keyword pfService bfd-control bfd-echo bftp bgp bgpd biff bootpc
endif syn keyword pfService bootps canna cddb cddbp chargen chat cmd
syn keyword pfService cmip-agent cmip-man comsat conference
syn keyword pfService conserver courier csnet-ns cso-ns cvspserver
syn keyword pfService daap datametrics daytime dhcpd-sync
syn keyword pfService dhcpv6-client dhcpv6-server discard domain
syn keyword pfService echo efs eklogin ekshell ekshell2 epmap eppc
syn keyword pfService exec finger ftp ftp-data git gopher hostname
syn keyword pfService hostnames hprop http https hunt hylafax iapp
syn keyword pfService icb ident imap imap2 imap3 imaps ingreslock
syn keyword pfService ipp iprop ipsec-msft ipsec-nat-t ipx irc
syn keyword pfService isakmp iscsi isisd iso-tsap kauth kdc kerberos
syn keyword pfService kerberos-adm kerberos-iv kerberos-sec
syn keyword pfService kerberos_master kf kip klogin kpasswd kpop
syn keyword pfService krb524 krb_prop krbupdate krcmd kreg kshell kx
syn keyword pfService l2tp ldap ldaps ldp link login mail mdns
syn keyword pfService mdnsresponder microsoft-ds ms-sql-m ms-sql-s
syn keyword pfService msa msp mtp mysql name nameserver netbios-dgm
syn keyword pfService netbios-ns netbios-ssn netnews netplan netrjs
syn keyword pfService netstat netwall newdate nextstep nfs nfsd
syn keyword pfService nicname nnsp nntp ntalk ntp null openwebnet
syn keyword pfService ospf6d ospfapi ospfd photuris pop2 pop3 pop3pw
syn keyword pfService pop3s poppassd portmap postgresql postoffice
syn keyword pfService pptp presence printer prospero prospero-np
syn keyword pfService puppet pwdgen qotd quote radacct radius
syn keyword pfService radius-acct rdp readnews remotefs resource rfb
syn keyword pfService rfe rfs rfs_server ripd ripng rje rkinit rlp
syn keyword pfService routed router rpc rpcbind rsync rtelnet rtsp
syn keyword pfService sa-msg-port sane-port sftp shell sieve silc
syn keyword pfService sink sip smtp smtps smux snmp snmp-trap
syn keyword pfService snmptrap snpp socks source spamd spamd-cfg
syn keyword pfService spamd-sync spooler spop3 ssdp ssh submission
syn keyword pfService sunrpc supdup supfiledbg supfilesrv support
syn keyword pfService svn svrloc swat syslog syslog-tls systat
syn keyword pfService tacacs tacas+ talk tap tcpmux telnet tempo
syn keyword pfService tftp time timed timeserver timserver tsap
syn keyword pfService ttylink ttytst ub-dns-control ulistserv untp
syn keyword pfService usenet users uucp uucp-path uucpd vnc vxlan
syn keyword pfService wais webster who whod whois www x400 x400-snd
syn keyword pfService xcept xdmcp xmpp-bosh xmpp-client xmpp-server
syn keyword pfService z3950 zabbix-agent zabbix-trapper zebra
syn keyword pfService zebrasrv
HiLink pfCmd Statement hi def link pfCmd Statement
HiLink pfComment Comment hi def link pfComment Comment
HiLink pfCont Statement hi def link pfCont Statement
HiLink pfErrClose Error hi def link pfErrClose Error
HiLink pfIPv4 Type hi def link pfIPv4 Type
HiLink pfIPv6 Type hi def link pfIPv6 Type
HiLink pfNetmask Constant hi def link pfNetmask Constant
HiLink pfNum Constant hi def link pfNum Constant
HiLink pfService Constant hi def link pfService Constant
HiLink pfTable Identifier hi def link pfString String
HiLink pfTodo Todo hi def link pfTable Identifier
HiLink pfVar Identifier hi def link pfTodo Todo
HiLink pfVarAssign Identifier hi def link pfVar Identifier
HiLink pfWildAddr Type hi def link pfVarAssign Identifier
hi def link pfWildAddr Type
delcommand HiLink
endif
let b:current_syntax = "pf" let b:current_syntax = "pf"