vim-patch:76db9e076318 (#21013)

Update runtime files 76db9e0763 - `col()`'s example was changed to use `:echowin` so that the message can be seen with `showmode`. Use "\n" to force a hit-enter instead as `:echowin` isn't ported. - Replace interpolated string usage in syntax/modula3.vim (not ported). - Add a space after the `wincmd =` examples in `*CTRL-W_=*` so that the inlined code is highlighted properly when followed by a full stop. Co-authored-by: Bram Moolenaar <Bram@vim.org>
2024-09-17 20:58:20 -04:00 · 2022-11-10 09:05:25 +00:00 · 2022-11-10 09:05:25 +00:00 · befae73044
commit befae73044
parent 61d152779d
18 changed files with 159 additions and 79 deletions
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@ -920,7 +920,8 @@ bufwinid({buf})						*bufwinid()*

 	echo "A window containing buffer 1 is " .. (bufwinid(1))
 <
-		Only deals with the current tab page.
+		Only deals with the current tab page.  See |win_findbuf()| for
+		finding more.

 		Can also be used as a |method|: >
 			FindBuffer()->bufwinid()
@ -1204,7 +1205,7 @@ col({expr})	The result is a Number, which is the byte index of the column
 		column is one higher if the cursor is after the end of the
 		line.  Also, when using a <Cmd> mapping the cursor isn't
 		moved, this can be used to obtain the column in Insert mode: >
-			:imap <F2> <Cmd>echo col(".")<CR>
+			:imap <F2> <Cmd>echo col(".").."\n"<CR>

 <		Can also be used as a |method|: >
 			GetPos()->col()
@ -2291,7 +2292,7 @@ flatten({list} [, {maxdepth}])					*flatten()*
 float2nr({expr})					*float2nr()*
 		Convert {expr} to a Number by omitting the part after the
 		decimal point.
-		{expr} must evaluate to a |Float| or a Number.
+		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0 if {expr} is not a |Float| or a |Number|.
 		When the value of {expr} is out of range for a |Number| the
 		result is truncated to 0x7fffffff or -0x7fffffff (or when
@ -9034,6 +9035,7 @@ win_move_separator({nr}, {offset})			*win_move_separator()*
 		FALSE otherwise.
 		This will fail for the rightmost window and a full-width
 		window, since it has no separator on the right.
+		Only works for the current tab page. *E1308*

 		Can also be used as a |method|: >
 			GetWinnr()->win_move_separator(offset)
@ -9048,6 +9050,7 @@ win_move_statusline({nr}, {offset})			*win_move_statusline()*
 		movement may be smaller than specified (e.g., as a consequence
 		of maintaining 'winminheight'). Returns TRUE if the window can
 		be found and FALSE otherwise.
+		Only works for the current tab page.

 		Can also be used as a |method|: >
 			GetWinnr()->win_move_statusline(offset)
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@ -758,7 +758,7 @@ always be swapped then.

 Count and Range						*N:*

-When giving a count before entering ":", this is translated into:
+When giving a count before entering ":", this is translated into: >
 		:.,.+(count - 1)
 In words: The "count" lines at and after the cursor.  Example: To delete
 three lines: >
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@ -992,8 +992,8 @@ Note: even when using "num" or "long" the number of flags available to
 compounding and prefixes is limited to about 250.


-AFFIXES
-					    *spell-PFX* *spell-SFX*
+AFFIXES						*spell-PFX* *spell-SFX*
+
 The usual PFX (prefix) and SFX (suffix) lines are supported (see the Myspell
 documentation or the Aspell manual:
 http://aspell.net/man-html/Affix-Compression.html).
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@ -224,7 +224,7 @@ you can see?  This figure shows the three commands you can use:
 			+---------------------------+

 Hints: "H" stands for Home, "M" for Middle and "L" for Last.  Alternatively,
-"H" for high, "M" for Middle and "L" for low.
+"H" for High, "M" for Middle and "L" for Low.

 ==============================================================================
 *03.6*	Telling where you are
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@ -103,7 +103,7 @@ gn			Search forward for the last used search pattern, like
 			E.g., "dgn" deletes the text of the next match.
 			If Visual mode is active, extends the selection
 			until the end of the next match.
-			'wrapscan' applies
+			'wrapscan' applies.
 			Note: Unlike `n` the search direction does not depend
 			on the previous search command.

--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@ -537,9 +537,9 @@ CTRL-W =	Make all windows (almost) equally high and wide, but use
 		Windows with 'winfixheight' set keep their height and windows
 		with 'winfixwidth' set keep their width.
 		To equalize only vertically (make window equally high) use
-		`vertical wincmd =`
+		`vertical wincmd =` .
 		To equalize only horizontally (make window equally wide) use
-		`horizontal wincmd =`
+		`horizontal wincmd =` .

 :res[ize] -N					*:res* *:resize* *CTRL-W_-*
 CTRL-W -	Decrease current window height by N (default 1).
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@ -4,7 +4,9 @@
 " Maintainer:   Marcin Szamotulski <profunctor@pm.me>
 " Previous Maintainer:	Vincent Berthoux <twinside@gmail.com>
 " File Types:   .cabal
-" Last Change:  21 Nov 2020
+" Last Change:  22 Oct 2022
+" v1.6: Added support for foreign-libraries
+"       Added highlighting for various fields 
 " v1.5: Incorporated changes from
 "       https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
 "       Use `syn keyword` instead of `syn match`.
@ -61,13 +63,14 @@ syn keyword cabalCategory contained
 	\ test-suite
 	\ source-repository
 	\ flag
+        \ foreign-library
 	\ custom-setup
 	\ common
 syn match cabalCategoryTitle contained /[^{]*\ze{\?/
 syn match cabalCategoryRegion
 	\ contains=cabalCategory,cabalCategoryTitle
 	\ nextgroup=cabalCategory skipwhite
-	\ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|custom-setup\|common\)\+\s*\%(.*$\|$\)/
+	\ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|foreign-library\|custom-setup\|common\)\+\s*\%(.*$\|$\)/
 syn keyword cabalTruth true false

 " cabalStatementRegion which limits the scope of cabalStatement keywords, this
@ -77,6 +80,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ default-language
 	\ default-extensions
 	\ author
+        \ autogen-includes
        \ autogen-modules
        \ asm-sources
        \ asm-options
@ -84,7 +88,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ bug-reports
 	\ build-depends
 	\ build-tools
-        \ build-tools-depends
+        \ build-tool-depends
 	\ build-type
 	\ buildable
 	\ c-sources
@ -95,6 +99,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
        \ cmm-sources
        \ cmm-options
 	\ cpp-options
+        \ cxx-options
        \ cxx-sources
 	\ data-dir
 	\ data-files
@ -111,7 +116,9 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
        \ extra-framework-dirs
        \ extra-ghci-libraries
 	\ extra-lib-dirs
+	\ extra-lib-dirs-static
 	\ extra-libraries
+	\ extra-libraries-static
 	\ extra-library-flavours
 	\ extra-source-files
 	\ extra-tmp-files
@ -133,6 +140,8 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ install-includes
        \ js-sources
 	\ ld-options
+        \ lib-version-info
+        \ lib-version-linux
 	\ license
 	\ license-file
 	\ location
@ -141,20 +150,26 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ manual
        \ mixins
 	\ module
+        \ mod-def-file
 	\ name
 	\ nhc98-options
+        \ options
 	\ other-extensions
        \ other-language
        \ other-languages
 	\ other-modules
 	\ package-url
 	\ pkgconfig-depends
+        \ scope
 	\ setup-depends
+        \ signatures
 	\ stability
 	\ subdir
 	\ synopsis
+        \ reexported-modules
 	\ tag
 	\ tested-with
+        \ test-module
 	\ type
 	\ version
 	\ virtual-modules
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2022 Jul 25
+" Last Change: 2022 Oct 29
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim

 " Standard syntax initialization
@ -21,9 +21,9 @@ let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
-      \ 'buster', 'bullseye', 'bookworm', 'trixie',
+      \ 'buster', 'bullseye', 'bookworm', 'trixie', 'forky',
      \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic',
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar',
      \ 'devel'
      \ ]
 let s:unsupported = [
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2022 Jul 25
+" Last Change: 2022 Oct 29
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim

 " Standard syntax initialization
@ -23,9 +23,9 @@ let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
-      \ 'buster', 'bullseye', 'bookworm', 'trixie',
+      \ 'buster', 'bullseye', 'bookworm', 'trixie', 'forky',
      \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic',
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar',
      \ 'devel'
      \ ]
 let s:unsupported = [
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2022 Oct 17
+" Last Change:	2022 Nov 09

 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@ -11,7 +11,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim

-syn match helpHeadline		"^ *[-A-Z.][-A-Z0-9 .()_]*?\=\ze\(\s\+\*\|$\)"
+syn match helpHeadline		"^[A-Z.][-A-Z0-9 .,()_]*?\=\ze\(\s\+\*\|$\)"
 syn match helpSectionDelim	"^===.*===$"
 syn match helpSectionDelim	"^---.*--$"
 if has("conceal")
--- a/runtime/syntax/hollywood.vim
+++ b/runtime/syntax/hollywood.vim
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@ -3,7 +3,7 @@
 " Maintainer:	Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>, <https://github.com/rohieb>
 " Previous Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		https://github.com/vim/vim/blob/master/runtime/syntax/make.vim
-" Last Change:	2020 Oct 16
+" Last Change:	2022 Nov 06

 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@ -45,11 +45,11 @@ 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
+	\ start="^[~A-Za-z0-9_./$(){}%-][A-Za-z0-9_./\t ${}()%-]*&\?:\?:\{1,2}[^:=]"rs=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*$"
+syn match makeTarget           "^[~A-Za-z0-9_./$(){}%*@-][A-Za-z0-9_./\t $(){}%*@-]*&\?::\=\s*$"
 	\ contains=makeIdent,makeSpecTarget,makeComment
 	\ skipnl nextgroup=makeCommands,makeCommandError

--- a/runtime/syntax/modula3.vim
+++ b/runtime/syntax/modula3.vim
@ -2,18 +2,29 @@
 " Language:		Modula-3
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Timo Pedersen <dat97tpe@ludat.lth.se>
-" Last Change:		2021 Apr 08
+" Last Change:		2022 Oct 31

 if exists("b:current_syntax")
  finish
 endif

-" Modula-3 keywords
-syn keyword modula3Keyword ANY ARRAY AS BITS BRANDED BY CASE CONST DEFINITION
-syn keyword modula3Keyword EVAL EXIT EXCEPT EXCEPTION EXIT EXPORTS FINALLY
-syn keyword modula3Keyword FROM GENERIC IMPORT LOCK METHOD OF RAISE RAISES
-syn keyword modula3Keyword READONLY RECORD REF RETURN SET TRY TYPE TYPECASE
-syn keyword modula3Keyword UNSAFE VALUE VAR WITH
+" Whitespace errors {{{1
+if exists("modula3_space_errors")
+  if !exists("modula3_no_trail_space_error")
+    syn match modula3SpaceError display excludenl "\s\+$"
+  endif
+  if !exists("modula3_no_tab_space_error")
+    syn match modula3SpaceError display " \+\t"me=e-1
+  endif
+endif
+
+" Keywords {{{1
+syn keyword modula3Keyword ANY ARRAY AS BITS BRANDED BY CASE CONST
+syn keyword modula3Keyword DEFINITION EVAL EXIT EXCEPT EXCEPTION EXIT
+syn keyword modula3Keyword EXPORTS FINALLY FROM GENERIC IMPORT LOCK METHOD
+syn keyword modula3Keyword OF RAISE RAISES READONLY RECORD REF
+syn keyword modula3Keyword RETURN SET TRY TYPE TYPECASE UNSAFE 
+syn keyword modula3Keyword VALUE VAR WITH

 syn match modula3keyword "\<UNTRACED\>"

@ -22,44 +33,73 @@ syn keyword modula3Block PROCEDURE FUNCTION MODULE INTERFACE REPEAT THEN
 syn keyword modula3Block BEGIN END OBJECT METHODS OVERRIDES RECORD REVEAL
 syn keyword modula3Block WHILE UNTIL DO TO IF FOR ELSIF ELSE LOOP

-" Reserved identifiers
+" Reserved identifiers {{{1
 syn keyword modula3Identifier ABS ADR ADRSIZE BITSIZE BYTESIZE CEILING DEC
 syn keyword modula3Identifier DISPOSE FIRST FLOAT FLOOR INC ISTYPE LAST
 syn keyword modula3Identifier LOOPHOLE MAX MIN NARROW NEW NUMBER ORD ROUND
 syn keyword modula3Identifier SUBARRAY TRUNC TYPECODE VAL

-" Predefined types
+" Predefined types {{{1
 syn keyword modula3Type ADDRESS BOOLEAN CARDINAL CHAR EXTENDED INTEGER
 syn keyword modula3Type LONGCARD LONGINT LONGREAL MUTEX NULL REAL REFANY TEXT
 syn keyword modula3Type WIDECHAR

 syn match modula3Type "\<\%(UNTRACED\s\+\)\=ROOT\>"

-" Operators
-syn keyword modulaOperator DIV MOD IN AND OR NOT
+" Operators {{{1
+syn keyword modula3Operator DIV MOD
+syn keyword modula3Operator IN
+syn keyword modula3Operator NOT AND OR

+" TODO: exclude = from declarations
 if exists("modula3_operators")
  syn match modula3Operator "\^"
-  syn match modula3Operator "+\|-\|\*\|/\|&"
-  " TODO: need to exclude = in procedure definitions
-  syn match modula3Operator "<=\|<\|>=\|>\|:\@<!=\|#"
+  syn match modula3Operator "[-+/*]"
+  syn match modula3Operator "&"
+  syn match modula3Operator "<=\|<:\@!\|>=\|>"
+  syn match modula3Operator ":\@<!=\|#"
 endif

+" Literals {{{1
+
 " Booleans
 syn keyword modula3Boolean TRUE FALSE

 " Nil
 syn keyword modula3Nil NIL

-" Integers
-syn match modula3Integer "\<\d\+L\=\>"
-syn match modula3Integer "\<\d\d\=_\x\+L\=\>"
+" Numbers {{{2

-" Reals
-syn match modula3Real	 "\c\<\d\+\.\d\+\%([EDX][+-]\=\d\+\)\=\>"
+" NOTE: Negated numbers are constant expressions not literals
+
+syn case ignore
+
+  " Integers
+
+  syn match modula3Integer "\<\d\+L\=\>"
+
+  if exists("modula3_number_errors")
+    syn match modula3IntegerError "\<\d\d\=_\x\+L\=\>"
+  endif
+
+  let s:digits = "0123456789ABCDEF"
+  for s:radix in range(2, 16)
+    " Nvim does not support interpolated strings yet.
+    " exe $'syn match modula3Integer "\<{s:radix}_[{s:digits[:s:radix - 1]}]\+L\=\>"'
+    exe 'syn match modula3Integer "\<' .. s:radix .. '_[' .. s:digits[:s:radix - 1] .. ']\+L\=\>"'
+  endfor
+  unlet s:digits s:radix
+
+  " Reals
+  syn match modula3Real	 "\<\d\+\.\d\+\%([EDX][+-]\=\d\+\)\=\>"
+
+syn case match
+
+" Strings and characters {{{2

 " String escape sequences
 syn match modula3Escape "\\['"ntrf]" contained display
+" TODO: limit to <= 377 (255)
 syn match modula3Escape "\\\o\{3}"   contained display
 syn match modula3Escape "\\\\"	     contained display

@ -69,13 +109,23 @@ syn match modula3Character "'\%([^']\|\\.\|\\\o\{3}\)'" contains=modula3Escape
 " Strings
 syn region modula3String start=+"+ end=+"+ contains=modula3Escape

-" Pragmas
+" Pragmas {{{1
+" EXTERNAL INLINE ASSERT TRACE FATAL UNUSED OBSOLETE CALLBACK EXPORTED PRAGMA NOWARN LINE LL LL.sup SPEC
+" Documented: INLINE ASSERT TRACE FATAL UNUSED OBSOLETE NOWARN
 syn region modula3Pragma start="<\*" end="\*>"

-" Comments
-syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell
+" Comments {{{1
+if !exists("modula3_no_comment_fold")
+  syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell fold
+  syn region modula3LineCommentBlock start="^\s*(\*.*\*)\s*\n\%(^\s*(\*.*\*)\s*$\)\@=" end="^\s*(\*.*\*)\s*\n\%(^\s*(\*.*\*)\s*$\)\@!" contains=modula3Comment transparent fold keepend
+else
+  syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell
+endif

-" Default highlighting
+" Syncing "{{{1
+syn sync minlines=100
+
+" Default highlighting {{{1
 hi def link modula3Block	Statement
 hi def link modula3Boolean	Boolean
 hi def link modula3Character	Character
@ -85,12 +135,13 @@ hi def link modula3Identifier	Keyword
 hi def link modula3Integer	Number
 hi def link modula3Keyword	Statement
 hi def link modula3Nil		Constant
+hi def link modula3IntegerError	Error
 hi def link modula3Operator	Operator
 hi def link modula3Pragma	PreProc
 hi def link modula3Real		Float
 hi def link modula3String	String
-hi def link modula3Type		Type
+hi def link modula3Type		Type		"}}}

 let b:current_syntax = "modula3"

-" vim: nowrap sw=2 sts=2 ts=8 noet:
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@ -6,9 +6,10 @@
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Contributor:  Dean, Adam Kenneth <adam.ken.dean@hpe.com>
-" Last Change:	2021 Mar 29
+" Last Change:	2022 Nov 09
 "		Added RemoteCommand from pull request #4809
 "		Included additional keywords from Martin.
+"		Included PR #5753
 " SSH Version:	8.5p1
 "

@ -57,12 +58,12 @@ syn match sshconfigCiphers "\<aes256-gcm@openssh\.com\>"
 syn match sshconfigCiphers "\<chacha20-poly1305@openssh\.com\>"

 syn keyword sshconfigMAC hmac-sha1
-syn keyword sshconfigMAC mac-sha1-96
-syn keyword sshconfigMAC mac-sha2-256
-syn keyword sshconfigMAC mac-sha2-512
-syn keyword sshconfigMAC mac-md5
-syn keyword sshconfigMAC mac-md5-96
-syn keyword sshconfigMAC mac-ripemd160
+syn keyword sshconfigMAC hmac-sha1-96
+syn keyword sshconfigMAC hmac-sha2-256
+syn keyword sshconfigMAC hmac-sha2-512
+syn keyword sshconfigMAC hmac-md5
+syn keyword sshconfigMAC hmac-md5-96
+syn keyword sshconfigMAC hmac-ripemd160
 syn match   sshconfigMAC "\<hmac-ripemd160@openssh\.com\>"
 syn match   sshconfigMAC "\<umac-64@openssh\.com\>"
 syn match   sshconfigMAC "\<umac-128@openssh\.com\>"
@ -78,16 +79,24 @@ syn match   sshconfigMAC "\<umac-128-etm@openssh\.com\>"

 syn keyword sshconfigHostKeyAlgo ssh-ed25519
 syn match sshconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<sk-ssh-ed25519@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<sk-ssh-ed25519-cert-v01@openssh\.com\>"
 syn keyword sshconfigHostKeyAlgo ssh-rsa
+syn keyword sshconfigHostKeyAlgo rsa-sha2-256
+syn keyword sshconfigHostKeyAlgo rsa-sha2-512
 syn keyword sshconfigHostKeyAlgo ssh-dss
 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp256
 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp384
 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp521
+syn match sshconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256@openssh\.com\>"
 syn match sshconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<rsa-sha2-256-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<rsa-sha2-512-cert-v01@openssh\.com\>"
 syn match sshconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
 syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
 syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
 syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"

 syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic
 syn keyword sshconfigPreferredAuth keyboard-interactive
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@ -7,7 +7,7 @@
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2021-03-29
+" Last Change:	2022 Nov 09
 " SSH Version:	8.5p1
 "

@ -59,12 +59,12 @@ syn match sshdconfigCiphers "\<aes256-gcm@openssh\.com\>"
 syn match sshdconfigCiphers "\<chacha20-poly1305@openssh\.com\>"

 syn keyword sshdconfigMAC hmac-sha1
-syn keyword sshdconfigMAC mac-sha1-96
-syn keyword sshdconfigMAC mac-sha2-256
-syn keyword sshdconfigMAC mac-sha2-512
-syn keyword sshdconfigMAC mac-md5
-syn keyword sshdconfigMAC mac-md5-96
-syn keyword sshdconfigMAC mac-ripemd160
+syn keyword sshdconfigMAC hmac-sha1-96
+syn keyword sshdconfigMAC hmac-sha2-256
+syn keyword sshdconfigMAC hmac-sha2-512
+syn keyword sshdconfigMAC hmac-md5
+syn keyword sshdconfigMAC hmac-md5-96
+syn keyword sshdconfigMAC hmac-ripemd160
 syn match   sshdconfigMAC "\<hmac-ripemd160@openssh\.com\>"
 syn match   sshdconfigMAC "\<umac-64@openssh\.com\>"
 syn match   sshdconfigMAC "\<umac-128@openssh\.com\>"
@ -258,6 +258,8 @@ syn keyword sshdconfigKeyword Subsystem
 syn keyword sshdconfigKeyword SyslogFacility
 syn keyword sshdconfigKeyword TCPKeepAlive
 syn keyword sshdconfigKeyword TrustedUserCAKeys
+syn keyword sshdconfigKeyword UseBlacklist
+syn keyword sshdconfigKeyword UseBlocklist
 syn keyword sshdconfigKeyword UseDNS
 syn keyword sshdconfigKeyword UseLogin
 syn keyword sshdconfigKeyword UsePAM