mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:ebdf3c964a90

Browse Source 
Update runtime files.
ebdf3c964a

Omit vim9.
This commit is contained in:
Jan Edmund Lazo
2021-04-26 21:38:12 -04:00
parent 4819737853
commit 278ca5f456
8 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/change.txt
View File

@@ -610,6 +610,8 @@ Directory for temporary files is created in the first suitable directory of:
|cmdline-ranges|. |cmdline-ranges|.
See |:s_flags| for [flags]. See |:s_flags| for [flags].
The delimiter doesn't need to be /, see
|pattern-delimiter|.
:[range]s[ubstitute] [flags] [count] :[range]s[ubstitute] [flags] [count]
:[range]&[&][flags] [count] *:&* :[range]&[&][flags] [count] *:&*
@@ -744,7 +746,7 @@ This deletes "TESTING" from all lines, but only one per line.
For compatibility with Vi these two exceptions are allowed: For compatibility with Vi these two exceptions are allowed:
"\/{string}/" and "\?{string}?" do the same as "//{string}/r". "\/{string}/" and "\?{string}?" do the same as "//{string}/r".
"\&{string}&" does the same as "//{string}/". "\&{string}&" does the same as "//{string}/".
*E146* *pattern-delimiter* *E146*
Instead of the '/' which surrounds the pattern and replacement string, you Instead of the '/' which surrounds the pattern and replacement string, you
can use any other single-byte character, but not an alphanumeric character, can use any other single-byte character, but not an alphanumeric character,
'\', '"' or '|'. This is useful if you want to include a '/' in the search '\', '"' or '|'. This is useful if you want to include a '/' in the search

1
runtime/doc/options.txt
View File

@@ -1102,6 +1102,7 @@ A jump table for the options with a short description can be found at |Q_op|.
This option is used together with 'bufhidden' and 'swapfile' to This option is used together with 'bufhidden' and 'swapfile' to
specify special kinds of buffers. See |special-buffers|. specify special kinds of buffers. See |special-buffers|.
Also see |win_gettype()|, which returns the type of the window.
Be careful with changing this option, it can have many side effects! Be careful with changing this option, it can have many side effects!

9
runtime/doc/starting.txt
View File

@@ -42,9 +42,12 @@ filename One or more file names. The first one will be the current
In most cases (except -s, -es, |--embed|, --headless) if stdin In most cases (except -s, -es, |--embed|, --headless) if stdin
is not a TTY then it is read as text, so "-" is implied: > is not a TTY then it is read as text, so "-" is implied: >
echo text | nvim file echo text | nvim file
< The buffer will be marked modified, because it contains text < The buffer will be marked as modified, because it contains
that needs to be saved (except for readonly |-R| mode). text that needs to be saved (except for readonly |-R| mode).
If you don't like that, put these lines in your init.vim: >
" Don't set 'modified' when reading from stdin
au StdinReadPost * set nomodified
<
To read stdin as Normal commands use |-s| with "-": > To read stdin as Normal commands use |-s| with "-": >
echo "ifoo" | nvim -s - echo "ifoo" | nvim -s -
< To read stdin as Ex commands use |-es| or |-e|: > < To read stdin as Ex commands use |-es| or |-e|: >

2
runtime/doc/tabpage.txt
View File

@@ -129,7 +129,7 @@ something else.
:+tabclose " close the next tab page :+tabclose " close the next tab page
:1tabclose " close the first tab page :1tabclose " close the first tab page
:$tabclose " close the last tab page :$tabclose " close the last tab page
:tabclose -2 " close the two previous tab page :tabclose -2 " close the 2nd previous tab page
:tabclose + " close the next tab page :tabclose + " close the next tab page
:tabclose 3 " close the third tab page :tabclose 3 " close the third tab page
:tabclose $ " close the last tab page :tabclose $ " close the last tab page

4
runtime/syntax/spec.vim
View File

@@ -3,7 +3,7 @@
" Language: SPEC: Build/install scripts for Linux RPM packages " Language: SPEC: Build/install scripts for Linux RPM packages
" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com " Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com
" Former Maintainer: Donovan Rebbechi elflord@panix.com (until March 2014) " Former Maintainer: Donovan Rebbechi elflord@panix.com (until March 2014)
" Last Change: 2019 Sep 27 " Last Change: 2020 Feb 07
" 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")
@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgroup=specSection start='^%description' end=
syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
"%% Scripts Section %% "%% Scripts Section %%
syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
"%% Changelog Section %% "%% Changelog Section %%
syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense

49
runtime/syntax/sshconfig.vim
View File

@@ -5,8 +5,9 @@
" Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de> " Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de>
" Contributor: Karsten Hopp <karsten@redhat.com> " Contributor: Karsten Hopp <karsten@redhat.com>
" Contributor: Dean, Adam Kenneth <adam.ken.dean@hpe.com> " Contributor: Dean, Adam Kenneth <adam.ken.dean@hpe.com>
" Last Change: 2019 Sep 09 " Last Change: 2020 Feb 12
" Added RemoteCommand from pull request #4809 " Added RemoteCommand from pull request #4809
" Included additional keywords from Martin.
" SSH Version: 7.4p1 " SSH Version: 7.4p1
" "
@@ -131,24 +132,25 @@ syn case ignore
" Keywords " Keywords
syn keyword sshconfigHostSect Host syn keyword sshconfigHostSect Host
syn keyword sshconfigMatch canonical exec host originalhost user localuser all syn keyword sshconfigMatch canonical final exec host originalhost user localuser all
syn keyword sshconfigKeyword AddressFamily syn keyword sshconfigKeyword AddressFamily
syn keyword sshconfigKeyword AddKeysToAgent syn keyword sshconfigKeyword AddKeysToAgent
syn keyword sshconfigKeyword BatchMode syn keyword sshconfigKeyword BatchMode
syn keyword sshconfigKeyword BindAddress syn keyword sshconfigKeyword BindAddress
syn keyword sshconfigKeyword BindInterface
syn keyword sshconfigKeyword CanonicalDomains syn keyword sshconfigKeyword CanonicalDomains
syn keyword sshconfigKeyword CanonicalizeFallbackLocal syn keyword sshconfigKeyword CanonicalizeFallbackLocal
syn keyword sshconfigKeyword CanonicalizeHostname syn keyword sshconfigKeyword CanonicalizeHostname
syn keyword sshconfigKeyword CanonicalizeMaxDots syn keyword sshconfigKeyword CanonicalizeMaxDots
syn keyword sshconfigKeyword CanonicalizePermittedCNAMEs
syn keyword sshconfigKeyword CASignatureAlgorithms
syn keyword sshconfigKeyword CertificateFile syn keyword sshconfigKeyword CertificateFile
syn keyword sshconfigKeyword ChallengeResponseAuthentication syn keyword sshconfigKeyword ChallengeResponseAuthentication
syn keyword sshconfigKeyword CheckHostIP syn keyword sshconfigKeyword CheckHostIP
syn keyword sshconfigKeyword Cipher
syn keyword sshconfigKeyword Ciphers syn keyword sshconfigKeyword Ciphers
syn keyword sshconfigKeyword ClearAllForwardings syn keyword sshconfigKeyword ClearAllForwardings
syn keyword sshconfigKeyword Compression syn keyword sshconfigKeyword Compression
syn keyword sshconfigKeyword CompressionLevel
syn keyword sshconfigKeyword ConnectTimeout syn keyword sshconfigKeyword ConnectTimeout
syn keyword sshconfigKeyword ConnectionAttempts syn keyword sshconfigKeyword ConnectionAttempts
syn keyword sshconfigKeyword ControlMaster syn keyword sshconfigKeyword ControlMaster
@@ -158,18 +160,13 @@ syn keyword sshconfigKeyword DynamicForward
syn keyword sshconfigKeyword EnableSSHKeysign syn keyword sshconfigKeyword EnableSSHKeysign
syn keyword sshconfigKeyword EscapeChar syn keyword sshconfigKeyword EscapeChar
syn keyword sshconfigKeyword ExitOnForwardFailure syn keyword sshconfigKeyword ExitOnForwardFailure
syn keyword sshconfigKeyword FingerprintHash
syn keyword sshconfigKeyword ForwardAgent syn keyword sshconfigKeyword ForwardAgent
syn keyword sshconfigKeyword ForwardX11 syn keyword sshconfigKeyword ForwardX11
syn keyword sshconfigKeyword ForwardX11Timeout syn keyword sshconfigKeyword ForwardX11Timeout
syn keyword sshconfigKeyword ForwardX11Trusted syn keyword sshconfigKeyword ForwardX11Trusted
syn keyword sshconfigKeyword GSSAPIAuthentication syn keyword sshconfigKeyword GSSAPIAuthentication
syn keyword sshconfigKeyword GSSAPIClientIdentity
syn keyword sshconfigKeyword GSSAPIDelegateCredentials syn keyword sshconfigKeyword GSSAPIDelegateCredentials
syn keyword sshconfigKeyword GSSAPIKeyExchange
syn keyword sshconfigKeyword GSSAPIRenewalForcesRekey
syn keyword sshconfigKeyword GSSAPIServerIdentity
syn keyword sshconfigKeyword GSSAPITrustDNS
syn keyword sshconfigKeyword GSSAPITrustDns
syn keyword sshconfigKeyword GatewayPorts syn keyword sshconfigKeyword GatewayPorts
syn keyword sshconfigKeyword GlobalKnownHostsFile syn keyword sshconfigKeyword GlobalKnownHostsFile
syn keyword sshconfigKeyword HashKnownHosts syn keyword sshconfigKeyword HashKnownHosts
@@ -180,6 +177,7 @@ syn keyword sshconfigKeyword HostbasedAuthentication
syn keyword sshconfigKeyword HostbasedKeyTypes syn keyword sshconfigKeyword HostbasedKeyTypes
syn keyword sshconfigKeyword IPQoS syn keyword sshconfigKeyword IPQoS
syn keyword sshconfigKeyword IdentitiesOnly syn keyword sshconfigKeyword IdentitiesOnly
syn keyword sshconfigKeyword IdentityAgent
syn keyword sshconfigKeyword IdentityFile syn keyword sshconfigKeyword IdentityFile
syn keyword sshconfigKeyword IgnoreUnknown syn keyword sshconfigKeyword IgnoreUnknown
syn keyword sshconfigKeyword Include syn keyword sshconfigKeyword Include
@@ -199,35 +197,53 @@ syn keyword sshconfigKeyword PasswordAuthentication
syn keyword sshconfigKeyword PermitLocalCommand syn keyword sshconfigKeyword PermitLocalCommand
syn keyword sshconfigKeyword Port syn keyword sshconfigKeyword Port
syn keyword sshconfigKeyword PreferredAuthentications syn keyword sshconfigKeyword PreferredAuthentications
syn keyword sshconfigKeyword Protocol
syn keyword sshconfigKeyword ProxyCommand syn keyword sshconfigKeyword ProxyCommand
syn keyword sshconfigKeyword ProxyJump syn keyword sshconfigKeyword ProxyJump
syn keyword sshconfigKeyword ProxyUseFDPass syn keyword sshconfigKeyword ProxyUseFDPass
syn keyword sshconfigKeyword PubkeyAcceptedKeyTypes syn keyword sshconfigKeyword PubkeyAcceptedKeyTypes
syn keyword sshconfigKeyword PubkeyAuthentication syn keyword sshconfigKeyword PubkeyAuthentication
syn keyword sshconfigKeyword RSAAuthentication
syn keyword sshconfigKeyword RekeyLimit syn keyword sshconfigKeyword RekeyLimit
syn keyword sshconfigKeyword RemoteCommand syn keyword sshconfigKeyword RemoteCommand
syn keyword sshconfigKeyword RemoteForward syn keyword sshconfigKeyword RemoteForward
syn keyword sshconfigKeyword RequestTTY syn keyword sshconfigKeyword RequestTTY
syn keyword sshconfigKeyword RhostsRSAAuthentication syn keyword sshconfigKeyword RevokedHostKeys
syn keyword sshconfigKeyword SecurityKeyProvider
syn keyword sshconfigKeyword SendEnv syn keyword sshconfigKeyword SendEnv
syn keyword sshconfigKeyword ServerAliveCountMax syn keyword sshconfigKeyword ServerAliveCountMax
syn keyword sshconfigKeyword ServerAliveInterval syn keyword sshconfigKeyword ServerAliveInterval
syn keyword sshconfigKeyword SmartcardDevice syn keyword sshconfigKeyword SmartcardDevice
syn keyword sshconfigKeyword SetEnv
syn keyword sshconfigKeyword StreamLocalBindMask
syn keyword sshconfigKeyword StreamLocalBindUnlink
syn keyword sshconfigKeyword StrictHostKeyChecking syn keyword sshconfigKeyword StrictHostKeyChecking
syn keyword sshconfigKeyword SyslogFacility
syn keyword sshconfigKeyword TCPKeepAlive syn keyword sshconfigKeyword TCPKeepAlive
syn keyword sshconfigKeyword Tunnel syn keyword sshconfigKeyword Tunnel
syn keyword sshconfigKeyword TunnelDevice syn keyword sshconfigKeyword TunnelDevice
syn keyword sshconfigKeyword UseBlacklistedKeys syn keyword sshconfigKeyword UseBlacklistedKeys
syn keyword sshconfigKeyword UsePrivilegedPort syn keyword sshconfigKeyword UpdateHostKeys
syn keyword sshconfigKeyword User syn keyword sshconfigKeyword User
syn keyword sshconfigKeyword UserKnownHostsFile syn keyword sshconfigKeyword UserKnownHostsFile
syn keyword sshconfigKeyword UseRoaming
syn keyword sshconfigKeyword VerifyHostKeyDNS syn keyword sshconfigKeyword VerifyHostKeyDNS
syn keyword sshconfigKeyword VisualHostKey syn keyword sshconfigKeyword VisualHostKey
syn keyword sshconfigKeyword XAuthLocation syn keyword sshconfigKeyword XAuthLocation
" Deprecated/ignored/remove/unsupported keywords
syn keyword sshConfigDeprecated Cipher
syn keyword sshconfigDeprecated GSSAPIClientIdentity
syn keyword sshconfigDeprecated GSSAPIKeyExchange
syn keyword sshconfigDeprecated GSSAPIRenewalForcesRekey
syn keyword sshconfigDeprecated GSSAPIServerIdentity
syn keyword sshconfigDeprecated GSSAPITrustDNS
syn keyword sshconfigDeprecated GSSAPITrustDns
syn keyword sshconfigDeprecated Protocol
syn keyword sshconfigDeprecated RSAAuthentication
syn keyword sshconfigDeprecated RhostsRSAAuthentication
syn keyword sshconfigDeprecated CompressionLevel
syn keyword sshconfigDeprecated UseRoaming
syn keyword sshconfigDeprecated UsePrivilegedPort
" Define the default highlighting " Define the default highlighting
hi def link sshconfigComment Comment hi def link sshconfigComment Comment
@@ -236,7 +252,7 @@ hi def link sshconfigHostPort sshconfigConstant
hi def link sshconfigNumber sshconfigConstant hi def link sshconfigNumber sshconfigConstant
hi def link sshconfigConstant Constant hi def link sshconfigConstant Constant
hi def link sshconfigYesNo sshconfigEnum hi def link sshconfigYesNo sshconfigEnum
hi def link sshconfigCipher sshconfigEnum hi def link sshconfigCipher sshconfigDeprecated
hi def link sshconfigCiphers sshconfigEnum hi def link sshconfigCiphers sshconfigEnum
hi def link sshconfigMAC sshconfigEnum hi def link sshconfigMAC sshconfigEnum
hi def link sshconfigHostKeyAlgo sshconfigEnum hi def link sshconfigHostKeyAlgo sshconfigEnum
@@ -254,6 +270,7 @@ hi def link sshconfigSpecial Special
hi def link sshconfigKeyword Keyword hi def link sshconfigKeyword Keyword
hi def link sshconfigHostSect Type hi def link sshconfigHostSect Type
hi def link sshconfigMatch Type hi def link sshconfigMatch Type
hi def link sshconfigDeprecated Error
let b:current_syntax = "sshconfig" let b:current_syntax = "sshconfig"

8
runtime/syntax/syncolor.vim
View File

@@ -1,6 +1,6 @@
" Vim syntax support file " Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2001 Sep 12 " Last Change: 2020 Feb 13
" This file sets up the default methods for highlighting. " This file sets up the default methods for highlighting.
" It is loaded from "synload.vim" and from Vim for ":syntax reset". " It is loaded from "synload.vim" and from Vim for ":syntax reset".
@@ -43,10 +43,12 @@ if &background == "dark"
else else
SynColor Comment term=bold cterm=NONE ctermfg=DarkBlue ctermbg=NONE gui=NONE guifg=Blue guibg=NONE SynColor Comment term=bold cterm=NONE ctermfg=DarkBlue ctermbg=NONE gui=NONE guifg=Blue guibg=NONE
SynColor Constant term=underline cterm=NONE ctermfg=DarkRed ctermbg=NONE gui=NONE guifg=Magenta guibg=NONE SynColor Constant term=underline cterm=NONE ctermfg=DarkRed ctermbg=NONE gui=NONE guifg=Magenta guibg=NONE
SynColor Special term=bold cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=SlateBlue guibg=NONE " #6a5acd is SlateBlue
SynColor Special term=bold cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=#6a5acd guibg=NONE
SynColor Identifier term=underline cterm=NONE ctermfg=DarkCyan ctermbg=NONE gui=NONE guifg=DarkCyan guibg=NONE SynColor Identifier term=underline cterm=NONE ctermfg=DarkCyan ctermbg=NONE gui=NONE guifg=DarkCyan guibg=NONE
SynColor Statement term=bold cterm=NONE ctermfg=Brown ctermbg=NONE gui=bold guifg=Brown guibg=NONE SynColor Statement term=bold cterm=NONE ctermfg=Brown ctermbg=NONE gui=bold guifg=Brown guibg=NONE
SynColor PreProc term=underline cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=Purple guibg=NONE " #6a0dad is Purple
SynColor PreProc term=underline cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=#6a0dad guibg=NONE
SynColor Type term=underline cterm=NONE ctermfg=DarkGreen ctermbg=NONE gui=bold guifg=SeaGreen guibg=NONE SynColor Type term=underline cterm=NONE ctermfg=DarkGreen ctermbg=NONE gui=bold guifg=SeaGreen guibg=NONE
SynColor Underlined term=underline cterm=underline ctermfg=DarkMagenta gui=underline guifg=SlateBlue SynColor Underlined term=underline cterm=underline ctermfg=DarkMagenta gui=underline guifg=SlateBlue
SynColor Ignore term=NONE cterm=NONE ctermfg=white ctermbg=NONE gui=NONE guifg=bg guibg=NONE SynColor Ignore term=NONE cterm=NONE ctermfg=white ctermbg=NONE gui=NONE guifg=bg guibg=NONE

2
test/functional/plugin/health_spec.lua
View File

@@ -118,7 +118,7 @@ describe('health.vim', function()
Error = { foreground = Screen.colors.Grey100, background = Screen.colors.Red }, Error = { foreground = Screen.colors.Grey100, background = Screen.colors.Red },
Heading = { bold=true, foreground=Screen.colors.Magenta }, Heading = { bold=true, foreground=Screen.colors.Magenta },
Heading2 = { foreground = Screen.colors.SlateBlue }, Heading2 = { foreground = Screen.colors.SlateBlue },
Bar = { foreground=Screen.colors.Purple }, Bar = { foreground = 0x6a0dad },
Bullet = { bold=true, foreground=Screen.colors.Brown }, Bullet = { bold=true, foreground=Screen.colors.Brown },
}) })
command("checkhealth foo success1") command("checkhealth foo success1")