aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-02 06:41:58 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-08-02 16:20:22 +0200
commitc6e4a29ad2fe1d0ab20ec9b46dfcd525b788527f (patch)
tree0831b10ce998eb7a06f15474b2f91d616b8a9b36
parent4ea83236670825a52e3a046847bbe96239d75394 (diff)
downloadrneovim-c6e4a29ad2fe1d0ab20ec9b46dfcd525b788527f.tar.gz
rneovim-c6e4a29ad2fe1d0ab20ec9b46dfcd525b788527f.tar.bz2
rneovim-c6e4a29ad2fe1d0ab20ec9b46dfcd525b788527f.zip
vim-patch:7dd64a3e57d2
Update runtime files. https://github.com/vim/vim/commit/7dd64a3e57d296fdee3b3ffe6d938f634b59848c
-rw-r--r--runtime/doc/quickref.txt1
-rw-r--r--runtime/doc/usr_41.txt18
-rw-r--r--runtime/syntax/sshdconfig.vim24
3 files changed, 31 insertions, 12 deletions
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 8712e37f77..f5f8532934 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -928,6 +928,7 @@ Short explanation of each option: *option-list*
'winaltkeys' 'wak' when the windows system handles ALT keys
'window' 'wi' nr of lines to scroll for CTRL-F and CTRL-B
'winheight' 'wh' minimum number of lines for the current window
+'winhighlight' 'winhl' window-local highlighting
'winfixheight' 'wfh' keep window height when opening/closing windows
'winfixwidth' 'wfw' keep window width when opening/closing windows
'winminheight' 'wmh' minimum number of lines for any window
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index a80ab963b1..c806507c3e 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -105,20 +105,21 @@ We won't explain how |:for| and |range()| work until later. Follow the links
if you are impatient.
-THREE KINDS OF NUMBERS
+FOUR KINDS OF NUMBERS
-Numbers can be decimal, hexadecimal or octal. A hexadecimal number starts
-with "0x" or "0X". For example "0x1f" is decimal 31. An octal number starts
-with a zero. "017" is decimal 15. Careful: don't put a zero before a decimal
-number, it will be interpreted as an octal number!
+Numbers can be decimal, hexadecimal, octal or binary. A hexadecimal number
+starts with "0x" or "0X". For example "0x1f" is decimal 31. An octal number
+starts with a zero. "017" is decimal 15. A binary number starts with "0b" or
+"0B". For example "0b101" is decimal 5. Careful: don't put a zero before a
+decimal number, it will be interpreted as an octal number!
The ":echo" command always prints decimal numbers. Example: >
:echo 0x7f 036
< 127 30 ~
-A number is made negative with a minus sign. This also works for hexadecimal
-and octal numbers. A minus sign is also used for subtraction. Compare this
-with the previous example: >
+A number is made negative with a minus sign. This also works for hexadecimal,
+octal and binary numbers. A minus sign is also used for subtraction. Compare
+this with the previous example: >
:echo 0x7f -036
< 97 ~
@@ -612,6 +613,7 @@ String manipulation: *string-functions*
repeat() repeat a string multiple times
eval() evaluate a string expression
execute() execute an Ex command and get the output
+ win_execute() like execute() but in a specified window
trim() trim characters from a string
List manipulation: *list-functions*
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index 3924aaf94a..f381668d16 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -6,8 +6,8 @@
" Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de>
" Contributor: Karsten Hopp <karsten@redhat.com>
" Originally: 2009-07-09
-" Last Change: 2017 Oct 25
-" SSH Version: 7.6p1
+" Last Change: 2019-05-31
+" SSH Version: 7.9p1
"
" Setup
@@ -137,7 +137,8 @@ syn case ignore
" Keywords
-syn keyword sshdconfigMatch Host User Group Address
+" Also includes RDomain, but that is a keyword.
+syn keyword sshdconfigMatch Host User Group Address LocalAddress LocalPort
syn keyword sshdconfigKeyword AcceptEnv
syn keyword sshdconfigKeyword AddressFamily
@@ -150,8 +151,11 @@ syn keyword sshdconfigKeyword AuthenticationMethods
syn keyword sshdconfigKeyword AuthorizedKeysFile
syn keyword sshdconfigKeyword AuthorizedKeysCommand
syn keyword sshdconfigKeyword AuthorizedKeysCommandUser
+syn keyword sshdconfigKeyword AuthorizedPrincipalsCommand
+syn keyword sshdconfigKeyword AuthorizedPrincipalsCommandUser
syn keyword sshdconfigKeyword AuthorizedPrincipalsFile
syn keyword sshdconfigKeyword Banner
+syn keyword sshdconfigKeyword CASignatureAlgorithms
syn keyword sshdconfigKeyword ChallengeResponseAuthentication
syn keyword sshdconfigKeyword ChrootDirectory
syn keyword sshdconfigKeyword Ciphers
@@ -162,13 +166,17 @@ syn keyword sshdconfigKeyword DebianBanner
syn keyword sshdconfigKeyword DenyGroups
syn keyword sshdconfigKeyword DenyUsers
syn keyword sshdconfigKeyword DisableForwarding
+syn keyword sshdconfigKeyword ExposeAuthInfo
+syn keyword sshdconfigKeyword FingerprintHash
syn keyword sshdconfigKeyword ForceCommand
+syn keyword sshdconfigKeyword GatewayPorts
syn keyword sshdconfigKeyword GSSAPIAuthentication
syn keyword sshdconfigKeyword GSSAPICleanupCredentials
+syn keyword sshdconfigKeyword GSSAPIEnablek5users
syn keyword sshdconfigKeyword GSSAPIKeyExchange
+syn keyword sshdconfigKeyword GSSAPIKexAlgorithms
syn keyword sshdconfigKeyword GSSAPIStoreCredentialsOnRekey
syn keyword sshdconfigKeyword GSSAPIStrictAcceptorCheck
-syn keyword sshdconfigKeyword GatewayPorts
syn keyword sshdconfigKeyword HostCertificate
syn keyword sshdconfigKeyword HostKey
syn keyword sshdconfigKeyword HostKeyAgent
@@ -184,6 +192,8 @@ syn keyword sshdconfigKeyword KerberosAuthentication
syn keyword sshdconfigKeyword KerberosGetAFSToken
syn keyword sshdconfigKeyword KerberosOrLocalPasswd
syn keyword sshdconfigKeyword KerberosTicketCleanup
+syn keyword sshdconfigKeyword KerberosUniqueCCache
+syn keyword sshdconfigKeyword KerberosUseKuserok
syn keyword sshdconfigKeyword KexAlgorithms
syn keyword sshdconfigKeyword KeyRegenerationInterval
syn keyword sshdconfigKeyword ListenAddress
@@ -197,6 +207,7 @@ syn keyword sshdconfigKeyword MaxStartups
syn keyword sshdconfigKeyword PasswordAuthentication
syn keyword sshdconfigKeyword PermitBlacklistedKeys
syn keyword sshdconfigKeyword PermitEmptyPasswords
+syn keyword sshdconfigKeyword PermitListen
syn keyword sshdconfigKeyword PermitOpen
syn keyword sshdconfigKeyword PermitRootLogin
syn keyword sshdconfigKeyword PermitTTY
@@ -213,10 +224,14 @@ syn keyword sshdconfigKeyword PubkeyAuthentication
syn keyword sshdconfigKeyword RSAAuthentication
syn keyword sshdconfigKeyword RekeyLimit
syn keyword sshdconfigKeyword RevokedKeys
+syn keyword sshdconfigKeyword RDomain
syn keyword sshdconfigKeyword RhostsRSAAuthentication
syn keyword sshdconfigKeyword ServerKeyBits
+syn keyword sshdconfigKeyword SetEnv
syn keyword sshdconfigKeyword ShowPatchLevel
syn keyword sshdconfigKeyword StrictModes
+syn keyword sshdconfigKeyword StreamLocalBindMask
+syn keyword sshdconfigKeyword StreamLocalBindUnlink
syn keyword sshdconfigKeyword Subsystem
syn keyword sshdconfigKeyword SyslogFacility
syn keyword sshdconfigKeyword TCPKeepAlive
@@ -227,6 +242,7 @@ syn keyword sshdconfigKeyword UsePAM
syn keyword sshdconfigKeyword VersionAddendum
syn keyword sshdconfigKeyword X11DisplayOffset
syn keyword sshdconfigKeyword X11Forwarding
+syn keyword sshdconfigKeyword X11MaxDisplays
syn keyword sshdconfigKeyword X11UseLocalhost
syn keyword sshdconfigKeyword XAuthLocation