diff options
author | Christian Clason <c.clason@uni-graz.at> | 2023-02-03 09:18:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-03 09:18:18 +0100 |
commit | 144279ef30a432ac8416746e3491f3120ae9b4e8 (patch) | |
tree | 5eebb630e445aecfac651307bcdb28e80a1c8d55 /runtime/syntax | |
parent | f9826e1dff5f1ac8212ca55a847c872c426142db (diff) | |
download | rneovim-144279ef30a432ac8416746e3491f3120ae9b4e8.tar.gz rneovim-144279ef30a432ac8416746e3491f3120ae9b4e8.tar.bz2 rneovim-144279ef30a432ac8416746e3491f3120ae9b4e8.zip |
vim-patch:be4e01637e71 (#22103)
Update runtime files.
https://github.com/vim/vim/commit/be4e01637e71c8d5095c33b9861fd70b41476732
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/2html.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/automake.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debchangelog.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debcontrol.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debcopyright.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debsources.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/dep3patch.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/forth.vim | 30 | ||||
-rw-r--r-- | runtime/syntax/gpg.vim | 162 | ||||
-rw-r--r-- | runtime/syntax/lc.vim | 31 | ||||
-rw-r--r-- | runtime/syntax/nginx.vim | 33 | ||||
-rw-r--r-- | runtime/syntax/sh.vim | 16 | ||||
-rw-r--r-- | runtime/syntax/shared/README.txt | 2 | ||||
-rw-r--r-- | runtime/syntax/tpp.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/xf86conf.vim | 10 |
15 files changed, 195 insertions, 121 deletions
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim index ce6797deaa..9f43e91309 100644 --- a/runtime/syntax/2html.vim +++ b/runtime/syntax/2html.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Ben Fritz <fritzophrenic@gmail.com> -" Last Change: 2022 Dec 26 +" Last Change: 2023 Jan 01 " " Additional contributors: " diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim index 8a7db7c27b..2f1ad982c6 100644 --- a/runtime/syntax/automake.vim +++ b/runtime/syntax/automake.vim @@ -2,8 +2,8 @@ " Language: automake Makefile.am " Maintainer: Debian Vim Maintainers " Former Maintainer: John Williams <jrw@pobox.com> -" Last Change: 2018 Dec 27 -" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/automake.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/automake.vim " " XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain " it only because patches have been submitted for it by Debian users and the diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim index 691c3778c1..d3c3d39304 100644 --- a/runtime/syntax/debchangelog.vim +++ b/runtime/syntax/debchangelog.vim @@ -3,8 +3,8 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Wichert Akkerman <wakkerma@debian.org> -" Last Change: 2022 Oct 29 -" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debchangelog.vim " Standard syntax initialization if exists('b:current_syntax') diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim index 4c7fb5dd63..c79b702f92 100644 --- a/runtime/syntax/debcontrol.vim +++ b/runtime/syntax/debcontrol.vim @@ -3,8 +3,8 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Wichert Akkerman <wakkerma@debian.org> -" Last Change: 2022 May 11 -" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcontrol.vim " Standard syntax initialization if exists('b:current_syntax') diff --git a/runtime/syntax/debcopyright.vim b/runtime/syntax/debcopyright.vim index c87b876eea..6f76b5c868 100644 --- a/runtime/syntax/debcopyright.vim +++ b/runtime/syntax/debcopyright.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Debian copyright file " Maintainer: Debian Vim Maintainers -" Last Change: 2019 Sep 07 -" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcopyright.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcopyright.vim " Standard syntax initialization if exists('b:current_syntax') diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim index 9b75797b54..69900c7a51 100644 --- a/runtime/syntax/debsources.vim +++ b/runtime/syntax/debsources.vim @@ -2,8 +2,8 @@ " Language: Debian sources.list " Maintainer: Debian Vim Maintainers " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl> -" Last Change: 2022 Oct 29 -" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim " Standard syntax initialization if exists('b:current_syntax') @@ -14,7 +14,7 @@ endif syn case match " A bunch of useful keywords -syn match debsourcesKeyword /\(deb-src\|deb\|main\|contrib\|non-free\|restricted\|universe\|multiverse\)/ +syn match debsourcesKeyword /\(deb-src\|deb\|main\|contrib\|non-free\|non-free-firmware\|restricted\|universe\|multiverse\)/ " Match comments syn match debsourcesComment /#.*/ contains=@Spell diff --git a/runtime/syntax/dep3patch.vim b/runtime/syntax/dep3patch.vim index cb0eda8931..c00bddfde2 100644 --- a/runtime/syntax/dep3patch.vim +++ b/runtime/syntax/dep3patch.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Debian DEP3 Patch headers " Maintainer: Gabriel Filion <gabster@lelutin.ca> -" Last Change: 2022 Apr 06 -" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/dep3patch.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/dep3patch.vim " " Specification of the DEP3 patch header format is available at: " https://dep-team.pages.debian.net/deps/dep3/ diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim index 721bceb367..fe98634079 100644 --- a/runtime/syntax/forth.vim +++ b/runtime/syntax/forth.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: FORTH " Current Maintainer: Johan Kotlinski <kotlinski@gmail.com> -" Previous Maintainer: Christian V. J. Brüssow <cvjb@cvjb.de> -" Last Change: 2018-03-29 +" Previous Maintainer: Christian V. J. Br�ssow <cvjb@cvjb.de> +" Last Change: 2023-01-12 " Filenames: *.fs,*.ft " URL: https://github.com/jkotlinski/forth.vim @@ -23,7 +23,6 @@ syn case ignore " Some special, non-FORTH keywords syn keyword forthTodo contained TODO FIXME XXX -syn match forthTodo contained 'Copyright\(\s([Cc])\)\=\(\s[0-9]\{2,4}\)\=' " Characters allowed in keywords " I don't know if 128-255 are allowed in ANS-FORTH @@ -98,13 +97,16 @@ syn keyword forthEndOfColonDef ; ;M ;m syn keyword forthEndOfClassDef ;class syn keyword forthEndOfObjectDef ;object syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE -syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS DOES> IMMEDIATE +syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS <BUILDS DOES> IMMEDIATE syn keyword forthDefine COMPILE-ONLY COMPILE RESTRICT INTERPRET POSTPONE EXECUTE syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION> syn keyword forthDefine <INTERPRETATION COMPILATION> <COMPILATION ] LASTXT syn keyword forthDefine COMP' POSTPONE, FIND-NAME NAME>INT NAME?INT NAME>COMP syn keyword forthDefine NAME>STRING STATE C; CVARIABLE BUFFER: MARKER syn keyword forthDefine , 2, F, C, COMPILE, +syn match forthDefine "\[DEFINED]" +syn match forthDefine "\[UNDEFINED]" +syn match forthDefine "\[IF]" syn match forthDefine "\[IFDEF]" syn match forthDefine "\[IFUNDEF]" syn match forthDefine "\[THEN]" @@ -180,6 +182,7 @@ syn keyword forthBlocks BLOCK-INCLUDED BLK syn keyword forthMath DECIMAL HEX BASE syn match forthInteger '\<-\=[0-9]\+.\=\>' syn match forthInteger '\<&-\=[0-9]\+.\=\>' +syn match forthInteger '\<#-\=[0-9]\+.\=\>' " recognize hex and binary numbers, the '$' and '%' notation is for gforth syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess syn match forthInteger '\<\x*\d\x*\>' " *2* --- this order! @@ -192,18 +195,18 @@ syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe][-+]\d\+\>' syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo " Strings -syn region forthString start=+\.*\"+ end=+"+ end=+$+ +syn region forthString start=+\.*\"+ end=+"+ end=+$+ contains=@Spell " XXX -syn region forthString start=+s\"+ end=+"+ end=+$+ -syn region forthString start=+s\\\"+ end=+"+ end=+$+ -syn region forthString start=+c\"+ end=+"+ end=+$+ +syn region forthString start=+s\"+ end=+"+ end=+$+ contains=@Spell +syn region forthString start=+s\\\"+ end=+"+ end=+$+ contains=@Spell +syn region forthString start=+c\"+ end=+"+ end=+$+ contains=@Spell " Comments -syn match forthComment '\\\s.*$' contains=forthTodo,forthSpaceError -syn region forthComment start='\\S\s' end='.*' contains=forthTodo,forthSpaceError -syn match forthComment '\.(\s[^)]*)' contains=forthTodo,forthSpaceError -syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=forthTodo,forthSpaceError -syn region forthComment start='/\*' end='\*/' contains=forthTodo,forthSpaceError +syn match forthComment '\\\%(\s.*\)\=$' contains=@Spell,forthTodo,forthSpaceError +syn region forthComment start='\\S\s' end='.*' contains=@Spell,forthTodo,forthSpaceError +syn match forthComment '\.(\s[^)]*)' contains=@Spell,forthTodo,forthSpaceError +syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=@Spell,forthTodo,forthSpaceError +syn region forthComment start='/\*' end='\*/' contains=@Spell,forthTodo,forthSpaceError " Include files syn match forthInclude '^INCLUDE\s\+\k\+' @@ -260,3 +263,4 @@ let b:current_syntax = "forth" let &cpo = s:cpo_save unlet s:cpo_save " vim:ts=8:sw=4:nocindent:smartindent: + diff --git a/runtime/syntax/gpg.vim b/runtime/syntax/gpg.vim index 46e2099994..57f712b6a3 100644 --- a/runtime/syntax/gpg.vim +++ b/runtime/syntax/gpg.vim @@ -1,7 +1,8 @@ " Vim syntax file -" Language: gpg(1) configuration file -" Previous Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2010-10-14 +" Language: gpg(1) configuration file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2010-10-14 +" Updated: 2023-01-23 @ObserverOfTime: added a couple of keywords if exists("b:current_syntax") finish @@ -12,91 +13,92 @@ set cpo&vim setlocal iskeyword+=- -syn keyword gpgTodo contained FIXME TODO XXX NOTE +syn keyword gpgTodo contained FIXME TODO XXX NOTE -syn region gpgComment contained display oneline start='#' end='$' - \ contains=gpgTodo,gpgID,@Spell +syn region gpgComment contained display oneline start='#' end='$' + \ contains=gpgTodo,gpgID,@Spell -syn match gpgID contained display '\<\(0x\)\=\x\{8,}\>' +syn match gpgID contained display '\<\(0x\)\=\x\{8,}\>' -syn match gpgBegin display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand +syn match gpgBegin display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand -syn keyword gpgCommand contained skipwhite nextgroup=gpgArg - \ check-sigs decrypt decrypt-files delete-key - \ delete-secret-and-public-key delete-secret-key - \ edit-key encrypt-files export export-all - \ export-ownertrust export-secret-keys - \ export-secret-subkeys fast-import fingerprint - \ gen-prime gen-random import import-ownertrust - \ list-keys list-public-keys list-secret-keys - \ list-sigs lsign-key nrsign-key print-md print-mds - \ recv-keys search-keys send-keys sign-key verify - \ verify-files -syn keyword gpgCommand contained skipwhite nextgroup=gpgArgError - \ check-trustdb clearsign desig-revoke detach-sign - \ encrypt gen-key gen-revoke help list-packets - \ rebuild-keydb-caches sign store symmetric - \ update-trustdb version warranty +syn keyword gpgCommand contained skipwhite nextgroup=gpgArg + \ check-sigs decrypt decrypt-files delete-key + \ delete-secret-and-public-key delete-secret-key + \ edit-key encrypt-files export export-all + \ export-ownertrust export-secret-keys + \ export-secret-subkeys fast-import fingerprint + \ gen-prime gen-random import import-ownertrust + \ list-keys list-public-keys list-secret-keys + \ list-sigs lsign-key nrsign-key print-md print-mds + \ recv-keys search-keys send-keys sign-key verify + \ verify-files +syn keyword gpgCommand contained skipwhite nextgroup=gpgArgError + \ check-trustdb clearsign desig-revoke detach-sign + \ encrypt gen-key gen-revoke help list-packets + \ rebuild-keydb-caches sign store symmetric + \ update-trustdb version warranty -syn keyword gpgOption contained skipwhite nextgroup=gpgArg - \ attribute-fd cert-digest-algo charset cipher-algo - \ command-fd comment completes-needed compress - \ compress-algo debug default-cert-check-level - \ default-key default-preference-list - \ default-recipient digest-algo disable-cipher-algo - \ disable-pubkey-algo encrypt-to exec-path - \ export-options group homedir import-options - \ keyring keyserver keyserver-options load-extension - \ local-user logger-fd marginals-needed max-cert-depth - \ notation-data options output override-session-key - \ passphrase-fd personal-cipher-preferences - \ personal-compress-preferences - \ personal-digest-preferences photo-viewer - \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode - \ secret-keyring set-filename set-policy-url status-fd - \ trusted-key verify-options keyid-format list-options -syn keyword gpgOption contained skipwhite nextgroup=gpgArgError - \ allow-freeform-uid allow-non-selfsigned-uid - \ allow-secret-key-import always-trust - \ armor ask-cert-expire ask-sig-expire - \ auto-check-trustdb batch debug-all default-comment - \ default-recipient-self dry-run emit-version - \ emulate-md-encode-bug enable-special-filenames - \ escape-from-lines expert fast-list-mode - \ fixed-list-mode for-your-eyes-only - \ force-mdc force-v3-sigs force-v4-certs - \ gpg-agent-info ignore-crc-error ignore-mdc-error - \ ignore-time-conflict ignore-valid-from interactive - \ list-only lock-multiple lock-never lock-once - \ merge-only no no-allow-non-selfsigned-uid - \ no-armor no-ask-cert-expire no-ask-sig-expire - \ no-auto-check-trustdb no-batch no-comment - \ no-default-keyring no-default-recipient - \ no-encrypt-to no-expensive-trust-checks - \ no-expert no-for-your-eyes-only no-force-v3-sigs - \ no-force-v4-certs no-greeting no-literal - \ no-mdc-warning no-options no-permission-warning - \ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file - \ no-secmem-warning no-show-notation no-show-photos - \ no-show-policy-url no-sig-cache no-sig-create-check - \ no-sk-comments no-tty no-utf8-strings no-verbose - \ no-version not-dash-escaped openpgp pgp2 - \ pgp6 pgp7 preserve-permissions quiet rfc1991 - \ set-filesize show-keyring show-notation show-photos - \ show-policy-url show-session-key simple-sk-checksum - \ sk-comments skip-verify textmode throw-keyid - \ try-all-secrets use-agent use-embedded-filename - \ utf8-strings verbose with-colons with-fingerprint - \ with-key-data yes +syn keyword gpgOption contained skipwhite nextgroup=gpgArg + \ attribute-fd cert-digest-algo charset cipher-algo + \ command-fd comment completes-needed compress + \ compress-algo debug default-cert-check-level + \ default-key default-preference-list + \ default-recipient digest-algo disable-cipher-algo + \ disable-pubkey-algo encrypt-to exec-path + \ export-options group homedir import-options + \ keyring keyserver keyserver-options load-extension + \ local-user logger-fd marginals-needed max-cert-depth + \ notation-data options output override-session-key + \ passphrase-fd personal-cipher-preferences + \ personal-compress-preferences + \ personal-digest-preferences photo-viewer + \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode + \ secret-keyring set-filename set-policy-url status-fd + \ trusted-key verify-options keyid-format list-options + \ default-new-key-algo weak-digest +syn keyword gpgOption contained skipwhite nextgroup=gpgArgError + \ allow-freeform-uid allow-non-selfsigned-uid + \ allow-secret-key-import always-trust + \ armor ask-cert-expire ask-sig-expire + \ auto-check-trustdb batch debug-all default-comment + \ default-recipient-self dry-run emit-version + \ emulate-md-encode-bug enable-special-filenames + \ escape-from-lines expert fast-list-mode + \ fixed-list-mode for-your-eyes-only + \ force-mdc force-v3-sigs force-v4-certs + \ gpg-agent-info ignore-crc-error ignore-mdc-error + \ ignore-time-conflict ignore-valid-from interactive + \ list-only lock-multiple lock-never lock-once + \ merge-only no no-allow-non-selfsigned-uid + \ no-armor no-ask-cert-expire no-ask-sig-expire + \ no-auto-check-trustdb no-batch no-comment + \ no-default-keyring no-default-recipient + \ no-encrypt-to no-expensive-trust-checks + \ no-expert no-for-your-eyes-only no-force-v3-sigs + \ no-force-v4-certs no-greeting no-literal + \ no-mdc-warning no-options no-permission-warning + \ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file + \ no-secmem-warning no-show-notation no-show-photos + \ no-show-policy-url no-sig-cache no-sig-create-check + \ no-sk-comments no-tty no-utf8-strings no-verbose + \ no-version not-dash-escaped openpgp pgp2 + \ pgp6 pgp7 preserve-permissions quiet rfc1991 + \ set-filesize show-keyring show-notation show-photos + \ show-policy-url show-session-key simple-sk-checksum + \ sk-comments skip-verify textmode throw-keyid + \ try-all-secrets use-agent use-embedded-filename + \ utf8-strings verbose with-colons with-fingerprint + \ with-key-data yes -syn match gpgArg contained display '\S\+\(\s\+\S\+\)*' contains=gpgID +syn match gpgArg contained display '\S\+\(\s\+\S\+\)*' contains=gpgID syn match gpgArgError contained display '\S\+\(\s\+\S\+\)*' -hi def link gpgComment Comment -hi def link gpgTodo Todo -hi def link gpgID Number -hi def link gpgOption Keyword -hi def link gpgCommand Error +hi def link gpgComment Comment +hi def link gpgTodo Todo +hi def link gpgID Number +hi def link gpgOption Keyword +hi def link gpgCommand Error hi def link gpgArgError Error let b:current_syntax = "gpg" diff --git a/runtime/syntax/lc.vim b/runtime/syntax/lc.vim new file mode 100644 index 0000000000..a334529385 --- /dev/null +++ b/runtime/syntax/lc.vim @@ -0,0 +1,31 @@ +" Vim syntax file +" Language: Elsa +" Maintainer: Miles Glapa-Grossklag <miles@glapa-grossklag.com> +" Last Change: 2023-01-29 + +if exists('b:current_syntax') + finish +endif + +" Keywords +syntax keyword elsaKeyword let eval +syntax match elsaKeyword "\v:" +highlight link elsaKeyword Keyword + +" Comments +setlocal commentstring=--%s +syntax match elsaComment "\v--.*$" +highlight link elsaComment Comment + +" Operators +syntax match elsaOperator "\v\=" +syntax match elsaOperator "\v\=[abd*~]\>" +syntax match elsaOperator "\v-\>" +syntax match elsaOperator "\v\\" +highlight link elsaOperator Operator + +" Definitions +syntax match elsaConstant "\v[A-Z]+[A-Z_0-9]*" +highlight link elsaConstant Constant + +let b:current_syntax = 'elsa' diff --git a/runtime/syntax/nginx.vim b/runtime/syntax/nginx.vim index 18dd50cbb2..04760e4a20 100644 --- a/runtime/syntax/nginx.vim +++ b/runtime/syntax/nginx.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: nginx.conf " Maintainer: Chris Aumann <me@chr4.org> -" Last Change: Apr 15, 2017 +" Last Change: Jan 25, 2023 if exists("b:current_syntax") finish @@ -84,6 +84,8 @@ syn keyword ngxListenOptions default_server contained syn keyword ngxListenOptions ssl contained syn keyword ngxListenOptions http2 contained syn keyword ngxListenOptions spdy contained +syn keyword ngxListenOptions http3 contained +syn keyword ngxListenOptions quic contained syn keyword ngxListenOptions proxy_protocol contained syn keyword ngxListenOptions setfib contained syn keyword ngxListenOptions fastopen contained @@ -265,8 +267,16 @@ syn keyword ngxDirective http2_max_concurrent_streams syn keyword ngxDirective http2_max_field_size syn keyword ngxDirective http2_max_header_size syn keyword ngxDirective http2_max_requests +syn keyword ngxDirective http2_push +syn keyword ngxDirective http2_push_preload syn keyword ngxDirective http2_recv_buffer_size syn keyword ngxDirective http2_recv_timeout +syn keyword ngxDirective http3_hq +syn keyword ngxDirective http3_max_concurrent_pushes +syn keyword ngxDirective http3_max_concurrent_streams +syn keyword ngxDirective http3_push +syn keyword ngxDirective http3_push_preload +syn keyword ngxDirective http3_stream_buffer_size syn keyword ngxDirective if_modified_since syn keyword ngxDirective ignore_invalid_headers syn keyword ngxDirective image_filter @@ -444,6 +454,10 @@ syn keyword ngxDirective proxy_temp_path syn keyword ngxDirective proxy_timeout syn keyword ngxDirective proxy_upload_rate syn keyword ngxDirective queue +syn keyword ngxDirective quic_gso +syn keyword ngxDirective quic_host_key +syn keyword ngxDirective quic_mtu +syn keyword ngxDirective quic_retry syn keyword ngxDirective random_index syn keyword ngxDirective read_ahead syn keyword ngxDirective real_ip_header @@ -545,8 +559,10 @@ syn keyword ngxDirective ssl_certificate syn keyword ngxDirective ssl_certificate_key syn keyword ngxDirective ssl_ciphers syn keyword ngxDirective ssl_client_certificate +syn keyword ngxDirective ssl_conf_command syn keyword ngxDirective ssl_crl syn keyword ngxDirective ssl_dhparam +syn keyword ngxDirective ssl_early_data syn keyword ngxDirective ssl_ecdh_curve syn keyword ngxDirective ssl_engine syn keyword ngxDirective ssl_handshake_timeout @@ -556,6 +572,7 @@ syn keyword ngxSSLPreferServerCiphersOn on contained syn keyword ngxSSLPreferServerCiphersOff off contained syn keyword ngxDirective ssl_preread syn keyword ngxDirective ssl_protocols nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite +syn keyword ngxDirective ssl_reject_handshake syn match ngxSSLProtocol 'TLSv1' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite syn match ngxSSLProtocol 'TLSv1\.1' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite syn match ngxSSLProtocol 'TLSv1\.2' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite @@ -622,6 +639,7 @@ syn keyword ngxDirective uwsgi_buffering syn keyword ngxDirective uwsgi_buffers syn keyword ngxDirective uwsgi_busy_buffers_size syn keyword ngxDirective uwsgi_cache +syn keyword ngxDirective uwsgi_cache_background_update syn keyword ngxDirective uwsgi_cache_bypass syn keyword ngxDirective uwsgi_cache_key syn keyword ngxDirective uwsgi_cache_lock @@ -2225,6 +2243,19 @@ syn keyword ngxDirectiveThirdParty xss_override_status syn keyword ngxDirectiveThirdParty xss_check_status syn keyword ngxDirectiveThirdParty xss_input_types +" CT Module <https://github.com/grahamedgecombe/nginx-ct> +" Certificate Transparency module for nginx +syn keyword ngxDirectiveThirdParty ssl_ct +syn keyword ngxDirectiveThirdParty ssl_ct_static_scts + +" Dynamic TLS records patch <https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_records.patch> +" TLS Dynamic Record Resizing +syn keyword ngxDirectiveThirdParty ssl_dyn_rec_enable +syn keyword ngxDirectiveThirdParty ssl_dyn_rec_size_hi +syn keyword ngxDirectiveThirdParty ssl_dyn_rec_size_lo +syn keyword ngxDirectiveThirdParty ssl_dyn_rec_threshold +syn keyword ngxDirectiveThirdParty ssl_dyn_rec_timeout + " ZIP Module <https://www.nginx.com/resources/wiki/modules/zip/> " ZIP archiver for nginx diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 6722d62c89..13d74dbc17 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,8 +2,8 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> -" Last Change: Nov 25, 2022 -" Version: 204 +" Last Change: Dec 20, 2022 +" Version: 205 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras @@ -190,8 +190,10 @@ syn region shEmbeddedEcho contained matchgroup=shStatement start="\<print\>" ski " ===== if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") syn match shStatement "\<alias\>" - syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+\)\@=" skip="\\$" end="\>\|`" - syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+=\)\@=" skip="\\$" end="=" + syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]*\)\@=" skip="\\$" end="\>\|`" + syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]*=\)\@=" skip="\\$" end="=" +" syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+\)\@=" skip="\\$" end="\>\|`" +" syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+=\)\@=" skip="\\$" end="=" " Touch: {{{1 " ===== @@ -333,7 +335,7 @@ syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shComment " systems too, however, so the following syntax will flag $(..) as " an Error under /bin/sh. By consensus of vimdev'ers! if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") - syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList + syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$" skip='\\\\\|\\.' end=")" contains=@shCommandSubList syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList syn match shSkipInitWS contained "^\s\+" @@ -483,7 +485,9 @@ endif " Parameter Dereferencing: {{{1 " ======================== -if !exists("g:sh_no_error") && !(exists("b:is_bash") || exists("b:is_kornshell") || exists("b:is_posix")) +" Note: sh04 failure with following line +"if !exists("g:sh_no_error") && !(exists("b:is_bash") || exists("b:is_kornshell") || exists("b:is_posix")) +if !exists("g:sh_no_error") syn match shDerefWordError "[^}$[~]" contained endif syn match shDerefSimple "\$\%(\h\w*\|\d\)" nextgroup=@shNoZSList diff --git a/runtime/syntax/shared/README.txt b/runtime/syntax/shared/README.txt index f519d44faf..fade4b38a1 100644 --- a/runtime/syntax/shared/README.txt +++ b/runtime/syntax/shared/README.txt @@ -1,2 +1,2 @@ This directory "runtime/syntax/shared" contains Vim script files that are -generated or used by more then one syntax file. +generated or used by more than one syntax file. diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim index ca64b5dce1..e2b307b2a2 100644 --- a/runtime/syntax/tpp.vim +++ b/runtime/syntax/tpp.vim @@ -2,8 +2,8 @@ " Language: tpp - Text Presentation Program " Maintainer: Debian Vim Maintainers " Former Maintainer: Gerfried Fuchs <alfie@ist.org> -" Last Change: 2018 Dec 27 -" URL: https://salsa.debian.org/vim-team/vim-debian/master/syntax/tpp.vim +" Last Change: 2023 Jan 16 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/tpp.vim " Filenames: *.tpp " License: BSD " diff --git a/runtime/syntax/xf86conf.vim b/runtime/syntax/xf86conf.vim index 545eda7db0..e8162f3a35 100644 --- a/runtime/syntax/xf86conf.vim +++ b/runtime/syntax/xf86conf.vim @@ -1,13 +1,12 @@ " Vim syntax file -" This is a GENERATED FILE. Please always refer to source file at the URI below. " Language: XF86Config (XFree86 configuration file) " Former Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz> -" Last Change: 2010 Nov 01 -" URL: http://trific.ath.cx/Ftp/vim/syntax/xf86conf.vim +" Last Change By David: 2010 Nov 01 +" Last Change: 2023 Jan 23 " Required Vim Version: 6.0 " " Options: let xf86conf_xfree86_version = 3 or 4 -" to force XFree86 3.x or 4.x XF86Config syntax +" to force XFree86 3.x or 4.x XF86Config syntax " Setup " quit when a syntax file was already loaded @@ -147,6 +146,8 @@ syn keyword xf86confKeyword Hskew HTimings InputDevice IOBase MemBase Mode nextg syn keyword xf86confKeyword Modes Ramdac Screen TextClockFreq UseModes VendorName nextgroup=xf86confComment,xf86confValue syn keyword xf86confKeyword VertRefresh VideoRam ViewPort Virtual VScan VTimings nextgroup=xf86confComment,xf86confValue syn keyword xf86confKeyword Weight White nextgroup=xf86confComment,xf86confValue +syn keyword xf86confMatch MatchDevicePath MatchDriver MatchLayout MatchOS MatchPnPID MatchProduct MatchTag MatchUSBID MatchVendor nextgroup=xf86confComment,xf86confString skipwhite +syn keyword xf86confMatch MatchIsPointer MatchIsKeyboard MatchIsTouchpad MatchIsTouchscreen MatchIsJoystick nextgroup=xf86confComment,xf86confValue skipwhite syn keyword xf86confModeLine ModeLine nextgroup=xf86confComment,xf86confModeLineValue skipwhite skipnl " Constants @@ -185,6 +186,7 @@ hi def link xf86confOctalNumberError xf86confError hi def link xf86confError Error hi def link xf86confOption xf86confKeyword +hi def link xf86confMatch xf86confKeyword hi def link xf86confModeLine xf86confKeyword hi def link xf86confKeyword Type |