vim-patch:be4e01637e71 (#22103)

Update runtime files.

be4e01637e

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Christian Clason 2023-02-03 09:18:18 +01:00 committed by GitHub
parent f9826e1dff
commit 144279ef30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 464 additions and 359 deletions

View File

@ -1,6 +1,6 @@
" Vim autoload file for the tohtml plugin. " Vim autoload file for the tohtml plugin.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com> " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
" Last Change: 2019 Aug 16 " Last Change: 2023 Jan 01
" "
" Additional contributors: " Additional contributors:
" "
@ -351,6 +351,8 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
let s:old_magic = &magic let s:old_magic = &magic
set magic set magic
let html = []
if !s:settings.no_doc
if s:settings.use_xhtml if s:settings.use_xhtml
if s:settings.encoding != "" if s:settings.encoding != ""
let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>" let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
@ -363,7 +365,6 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
let style = [s:settings.use_xhtml ? "" : '-->'] let style = [s:settings.use_xhtml ? "" : '-->']
let body_line = '' let body_line = ''
let html = []
let s:html5 = 0 let s:html5 = 0
if s:settings.use_xhtml if s:settings.use_xhtml
call add(html, xml_line) call add(html, xml_line)
@ -408,6 +409,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
call add(html, '</head>') call add(html, '</head>')
let body_line_num = len(html) let body_line_num = len(html)
call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>') call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
endif
call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>") call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")
call add(html, '<tr>') call add(html, '<tr>')
@ -430,6 +432,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
" When not using CSS or when using xhtml, the <body> line can be important. " When not using CSS or when using xhtml, the <body> line can be important.
" Assume it will be the same for all buffers and grab it from the first " Assume it will be the same for all buffers and grab it from the first
" buffer. Similarly, need to grab the body end line as well. " buffer. Similarly, need to grab the body end line as well.
if !s:settings.no_doc
if body_line == '' if body_line == ''
1 1
call search('<body') call search('<body')
@ -471,6 +474,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_ 1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
$ $
?</body>?,$d_ ?</body>?,$d_
elseif !s:settings.no_modeline
" remove modeline from source files if it is included and we haven't deleted
" due to removing html footer already
$d
endif
let temp = getline(1,'$') let temp = getline(1,'$')
" clean out id on the main content container because we already set it on " clean out id on the main content container because we already set it on
" the table " the table
@ -478,7 +486,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
" undo deletion of start and end part " undo deletion of start and end part
" so we can later save the file as valid html " so we can later save the file as valid html
" TODO: restore using grabbed lines if undolevel is 1? " TODO: restore using grabbed lines if undolevel is 1?
if !s:settings.no_doc
normal! 2u normal! 2u
elseif !s:settings.no_modeline
normal! u
endif
if s:settings.use_css if s:settings.use_css
call add(html, '<td><div>') call add(html, '<td><div>')
elseif s:settings.use_xhtml elseif s:settings.use_xhtml
@ -495,17 +507,23 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
quit! quit!
endfor endfor
if !s:settings.no_doc
let html[body_line_num] = body_line let html[body_line_num] = body_line
endif
call add(html, '</tr>') call add(html, '</tr>')
call add(html, '</table>') call add(html, '</table>')
if !s:settings.no_doc
call add(html, s:body_end_line) call add(html, s:body_end_line)
call add(html, '</html>') call add(html, '</html>')
endif
" The generated HTML is admittedly ugly and takes a LONG time to fold. " The generated HTML is admittedly ugly and takes a LONG time to fold.
" Make sure the user doesn't do syntax folding when loading a generated file, " Make sure the user doesn't do syntax folding when loading a generated file,
" using a modeline. " using a modeline.
if !s:settings.no_modeline
call add(html, '<!-- vim: set foldmethod=manual : -->') call add(html, '<!-- vim: set foldmethod=manual : -->')
endif
let i = 1 let i = 1
let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html") let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
@ -542,6 +560,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
call append(0, html) call append(0, html)
if !s:settings.no_doc
if len(style) > 0 if len(style) > 0
1 1
let style_start = search('^</head>')-1 let style_start = search('^</head>')-1
@ -666,6 +685,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
\]) \])
endif "}}} endif "}}}
endif endif
endif
let &paste = s:old_paste let &paste = s:old_paste
let &magic = s:old_magic let &magic = s:old_magic

View File

@ -125,7 +125,7 @@ file for a moment and come back to the same file and be in diff mode again.
buffers. buffers.
The `:diffoff` command resets the relevant options to the values they had when The `:diffoff` command resets the relevant options to the values they had when
using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode. using `:diffsplit`, `:diffpatch`, `:diffthis`. or starting Vim in diff mode.
When using `:diffoff` twice the last saved values are restored. When using `:diffoff` twice the last saved values are restored.
Otherwise they are set to their default value: Otherwise they are set to their default value:

View File

@ -195,7 +195,7 @@ non-matching marker pairs. Example: >
/* funcB() {{{2 */ /* funcB() {{{2 */
void funcB() {} void funcB() {}
< *{{{* *}}}*
A fold starts at a "{{{" marker. The following number specifies the fold A fold starts at a "{{{" marker. The following number specifies the fold
level. What happens depends on the difference between the current fold level level. What happens depends on the difference between the current fold level
and the level given by the marker: and the level given by the marker:

View File

@ -6205,8 +6205,8 @@ A jump table for the options with a short description can be found at |Q_op|.
windows. windows.
* - Set highlight group to User{N}, where {N} is taken from the * - Set highlight group to User{N}, where {N} is taken from the
minwid field, e.g. %1*. Restore normal highlight with %* or %0*. minwid field, e.g. %1*. Restore normal highlight with %* or %0*.
The difference between User{N} and StatusLine will be applied The difference between User{N} and StatusLine will be applied to
to StatusLineNC for the statusline of non-current windows. StatusLineNC for the statusline of non-current windows.
The number N must be between 1 and 9. See |hl-User1..9| The number N must be between 1 and 9. See |hl-User1..9|
When displaying a flag, Vim removes the leading comma, if any, when When displaying a flag, Vim removes the leading comma, if any, when

View File

@ -353,8 +353,6 @@ processing a quickfix or location list command, it will be aborted.
If numbers [from] and/or [to] are given, the respective If numbers [from] and/or [to] are given, the respective
range of errors is listed. A negative number counts range of errors is listed. A negative number counts
from the last error backwards, -1 being the last error. from the last error backwards, -1 being the last error.
The 'switchbuf' settings are respected when jumping
to a buffer.
The |:filter| command can be used to display only the The |:filter| command can be used to display only the
quickfix entries matching a supplied pattern. The quickfix entries matching a supplied pattern. The
pattern is matched against the filename, module name, pattern is matched against the filename, module name,

View File

@ -3,9 +3,9 @@
" Maintainer: Debian Vim Maintainers <team+vim@tracker.debian.org> " Maintainer: Debian Vim Maintainers <team+vim@tracker.debian.org>
" Former Maintainers: Michael Piefel <piefel@informatik.hu-berlin.de> " Former Maintainers: Michael Piefel <piefel@informatik.hu-berlin.de>
" Stefano Zacchiroli <zack@debian.org> " Stefano Zacchiroli <zack@debian.org>
" Last Change: 2022 Jul 25 " Last Change: 2023 Jan 16
" License: Vim License " License: Vim License
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debchangelog.vim
" Bug completion requires apt-listbugs installed for Debian packages or " Bug completion requires apt-listbugs installed for Debian packages or
" python-launchpadlib installed for Ubuntu packages " python-launchpadlib installed for Ubuntu packages
@ -35,14 +35,14 @@ if exists('g:did_changelog_ftplugin')
finish finish
endif endif
" Don't load another plugin (this is global)
let g:did_changelog_ftplugin = 1
" Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise
" <CR> would not be recognized. See ":help 'cpoptions'". " <CR> would not be recognized. See ":help 'cpoptions'".
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
" Don't load another plugin (this is global)
let g:did_changelog_ftplugin = 1
" {{{1 GUI menu " {{{1 GUI menu
" Helper functions returning various data. " Helper functions returning various data.

View File

@ -2,8 +2,8 @@
" Language: Debian control files " Language: Debian control files
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainer: Pierre Habouzit <madcoder@debian.org> " Former Maintainer: Pierre Habouzit <madcoder@debian.org>
" Last Change: 2018-01-28 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debcontrol.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debcontrol.vim
" Do these settings once per buffer " Do these settings once per buffer
if exists('b:did_ftplugin') if exists('b:did_ftplugin')

View File

@ -1,9 +1,9 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Logcheck " Language: Logcheck
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Last Change: 2018 Dec 27 " Last Change: 2023 Jan 16
" License: Vim License " License: Vim License
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/logcheck.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/logcheck.vim
if exists('b:did_ftplugin') if exists('b:did_ftplugin')
finish finish

View File

@ -1,6 +1,6 @@
" Vim plugin for converting a syntax highlighted file to HTML. " Vim plugin for converting a syntax highlighted file to HTML.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com> " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
" Last Change: 2019 Nov 13 " Last Change: 2023 Jan 01
" "
" The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
" $VIMRUNTIME/syntax/2html.vim " $VIMRUNTIME/syntax/2html.vim
@ -8,11 +8,23 @@
if exists('g:loaded_2html_plugin') if exists('g:loaded_2html_plugin')
finish finish
endif endif
let g:loaded_2html_plugin = 'vim8.1_v2' let g:loaded_2html_plugin = 'vim9.0_v1'
" "
" Changelog: {{{ " Changelog: {{{
" 8.1_v2 (this version): - Fix Bitbucket issue #19: fix calculation of tab " 9.0_v1 (this version): - Implement g:html_no_doc and g:html_no_modeline
" for diff mode. Add tests.
" (Vim 9.0.1122): NOTE: no version string update for this version!
" - Bugfix for variable name in g:html_no_doc
" (Vim 9.0.0819): NOTE: no version string update for this version!
" - Add options g:html_no_doc, g:html_no_lines,
" and g:html_no_modeline (partially included in Vim
" runtime prior to version string update).
" - Updates for new Vim9 string append style (i.e. use
" ".." instead of ".")
"
" 8.1 updates: {{{
" 8.1_v2 (Vim 8.1.2312): - Fix SourceForge issue #19: fix calculation of tab
" stop position to use in expanding a tab, when that " stop position to use in expanding a tab, when that
" tab occurs after a syntax match which in turn " tab occurs after a syntax match which in turn
" comes after previously expanded tabs. " comes after previously expanded tabs.
@ -20,17 +32,17 @@ let g:loaded_2html_plugin = 'vim8.1_v2'
" destination file to ignore FileType events; " destination file to ignore FileType events;
" speeds up processing when the destination file " speeds up processing when the destination file
" already exists and HTML highlight takes too long. " already exists and HTML highlight takes too long.
" - Fix Bitbucket issue #20: progress bar could not be " - Fix SourceForge issue #20: progress bar could not be
" seen when DiffDelete background color matched " seen when DiffDelete background color matched
" StatusLine background color. Added TOhtmlProgress " StatusLine background color. Added TOhtmlProgress
" highlight group for manual user override, but " highlight group for manual user override, but
" calculate it to be visible compared to StatusLine " calculate it to be visible compared to StatusLine
" by default. " by default.
" - Fix Bitbucket issue #1: Remove workaround for old " - Fix SourceForge issue #1: Remove workaround for old
" browsers which don't support 'ch' CSS unit, since " browsers which don't support 'ch' CSS unit, since
" all modern browsers, including IE>=9, support it. " all modern browsers, including IE>=9, support it.
" - Fix Bitbucket issue #10: support termguicolors " - Fix SourceForge issue #10: support termguicolors
" - Fix Bitbucket issue #21: default to using " - Fix SourceForge issue #21: default to using
" generated content instead of <input> tags for " generated content instead of <input> tags for
" uncopyable text, so that text is correctly " uncopyable text, so that text is correctly
" prevented from being copied in chrome. Use " prevented from being copied in chrome. Use
@ -41,13 +53,14 @@ let g:loaded_2html_plugin = 'vim8.1_v2'
" - Fix fallback sizing of <input> tags for browsers " - Fix fallback sizing of <input> tags for browsers
" without "ch" support. " without "ch" support.
" - Fix cursor on unselectable diff filler text. " - Fix cursor on unselectable diff filler text.
" 8.1_v1 (Vim 8.1.0528): - Fix Bitbucket issue #6: Don't generate empty " 8.1_v1 (Vim 8.1.0528): - Fix SourceForge issue #6: Don't generate empty
" script tag. " script tag.
" - Fix Bitbucket issue #5: javascript should " - Fix SourceForge issue #5: javascript should
" declare variables with "var". " declare variables with "var".
" - Fix Bitbucket issue #13: errors thrown sourcing " - Fix SourceForge issue #13: errors thrown sourcing
" 2html.vim directly when plugins not loaded. " 2html.vim directly when plugins not loaded.
" - Fix Bitbucket issue #16: support 'vartabstop'. " - Fix SourceForge issue #16: support 'vartabstop'.
"}}}
" "
" 7.4 updates: {{{ " 7.4 updates: {{{
" 7.4_v2 (Vim 7.4.0899): Fix error raised when converting a diff containing " 7.4_v2 (Vim 7.4.0899): Fix error raised when converting a diff containing
@ -152,7 +165,7 @@ let g:loaded_2html_plugin = 'vim8.1_v2'
" TODO: {{{ " TODO: {{{
" * Check the issue tracker: " * Check the issue tracker:
" https://bitbucket.org/fritzophrenic/vim-tohtml/issues?status=new&status=open " https://sourceforge.net/p/vim-tohtml/issues/search/?q=%21status%3Aclosed
" * Options for generating the CSS in external style sheets. New :TOcss " * Options for generating the CSS in external style sheets. New :TOcss
" command to convert the current color scheme into a (mostly) generic CSS " command to convert the current color scheme into a (mostly) generic CSS
" stylesheet which can be re-used. Alternate stylesheet support? Good start " stylesheet which can be re-used. Alternate stylesheet support? Good start

View File

@ -1,6 +1,6 @@
" Vim syntax support file " Vim syntax support file
" Maintainer: Ben Fritz <fritzophrenic@gmail.com> " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
" Last Change: 2022 Dec 26 " Last Change: 2023 Jan 01
" "
" Additional contributors: " Additional contributors:
" "

View File

@ -2,8 +2,8 @@
" Language: automake Makefile.am " Language: automake Makefile.am
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainer: John Williams <jrw@pobox.com> " Former Maintainer: John Williams <jrw@pobox.com>
" Last Change: 2018 Dec 27 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/automake.vim " 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 " 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 " it only because patches have been submitted for it by Debian users and the

View File

@ -3,8 +3,8 @@
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org> " Wichert Akkerman <wakkerma@debian.org>
" Last Change: 2022 Oct 29 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debchangelog.vim
" Standard syntax initialization " Standard syntax initialization
if exists('b:current_syntax') if exists('b:current_syntax')

View File

@ -3,8 +3,8 @@
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org> " Wichert Akkerman <wakkerma@debian.org>
" Last Change: 2022 May 11 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcontrol.vim
" Standard syntax initialization " Standard syntax initialization
if exists('b:current_syntax') if exists('b:current_syntax')

View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: Debian copyright file " Language: Debian copyright file
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Last Change: 2019 Sep 07 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcopyright.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcopyright.vim
" Standard syntax initialization " Standard syntax initialization
if exists('b:current_syntax') if exists('b:current_syntax')

View File

@ -2,8 +2,8 @@
" Language: Debian sources.list " Language: Debian sources.list
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl> " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
" Last Change: 2022 Oct 29 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim
" Standard syntax initialization " Standard syntax initialization
if exists('b:current_syntax') if exists('b:current_syntax')
@ -14,7 +14,7 @@ endif
syn case match syn case match
" A bunch of useful keywords " 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 " Match comments
syn match debsourcesComment /#.*/ contains=@Spell syn match debsourcesComment /#.*/ contains=@Spell

View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: Debian DEP3 Patch headers " Language: Debian DEP3 Patch headers
" Maintainer: Gabriel Filion <gabster@lelutin.ca> " Maintainer: Gabriel Filion <gabster@lelutin.ca>
" Last Change: 2022 Apr 06 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/dep3patch.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/dep3patch.vim
" "
" Specification of the DEP3 patch header format is available at: " Specification of the DEP3 patch header format is available at:
" https://dep-team.pages.debian.net/deps/dep3/ " https://dep-team.pages.debian.net/deps/dep3/

View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: FORTH " Language: FORTH
" Current Maintainer: Johan Kotlinski <kotlinski@gmail.com> " Current Maintainer: Johan Kotlinski <kotlinski@gmail.com>
" Previous Maintainer: Christian V. J. Brüssow <cvjb@cvjb.de> " Previous Maintainer: Christian V. J. Br<EFBFBD>ssow <cvjb@cvjb.de>
" Last Change: 2018-03-29 " Last Change: 2023-01-12
" Filenames: *.fs,*.ft " Filenames: *.fs,*.ft
" URL: https://github.com/jkotlinski/forth.vim " URL: https://github.com/jkotlinski/forth.vim
@ -23,7 +23,6 @@ syn case ignore
" Some special, non-FORTH keywords " Some special, non-FORTH keywords
syn keyword forthTodo contained TODO FIXME XXX syn keyword forthTodo contained TODO FIXME XXX
syn match forthTodo contained 'Copyright\(\s([Cc])\)\=\(\s[0-9]\{2,4}\)\='
" Characters allowed in keywords " Characters allowed in keywords
" I don't know if 128-255 are allowed in ANS-FORTH " 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 forthEndOfClassDef ;class
syn keyword forthEndOfObjectDef ;object syn keyword forthEndOfObjectDef ;object
syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE 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 COMPILE-ONLY COMPILE RESTRICT INTERPRET POSTPONE EXECUTE
syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION> syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION>
syn keyword forthDefine <INTERPRETATION COMPILATION> <COMPILATION ] LASTXT syn keyword forthDefine <INTERPRETATION COMPILATION> <COMPILATION ] LASTXT
syn keyword forthDefine COMP' POSTPONE, FIND-NAME NAME>INT NAME?INT NAME>COMP 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 NAME>STRING STATE C; CVARIABLE BUFFER: MARKER
syn keyword forthDefine , 2, F, C, COMPILE, 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 "\[IFDEF]"
syn match forthDefine "\[IFUNDEF]" syn match forthDefine "\[IFUNDEF]"
syn match forthDefine "\[THEN]" syn match forthDefine "\[THEN]"
@ -180,6 +182,7 @@ syn keyword forthBlocks BLOCK-INCLUDED BLK
syn keyword forthMath DECIMAL HEX BASE syn keyword forthMath DECIMAL HEX BASE
syn match forthInteger '\<-\=[0-9]\+.\=\>' syn match forthInteger '\<-\=[0-9]\+.\=\>'
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 " recognize hex and binary numbers, the '$' and '%' notation is for gforth
syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess
syn match forthInteger '\<\x*\d\x*\>' " *2* --- this order! 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 syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo
" Strings " Strings
syn region forthString start=+\.*\"+ end=+"+ end=+$+ syn region forthString start=+\.*\"+ end=+"+ end=+$+ contains=@Spell
" XXX " XXX
syn region forthString start=+s\"+ end=+"+ end=+$+ syn region forthString start=+s\"+ end=+"+ end=+$+ contains=@Spell
syn region forthString start=+s\\\"+ end=+"+ end=+$+ syn region forthString start=+s\\\"+ end=+"+ end=+$+ contains=@Spell
syn region forthString start=+c\"+ end=+"+ end=+$+ syn region forthString start=+c\"+ end=+"+ end=+$+ contains=@Spell
" Comments " Comments
syn match forthComment '\\\s.*$' contains=forthTodo,forthSpaceError syn match forthComment '\\\%(\s.*\)\=$' contains=@Spell,forthTodo,forthSpaceError
syn region forthComment start='\\S\s' end='.*' contains=forthTodo,forthSpaceError syn region forthComment start='\\S\s' end='.*' contains=@Spell,forthTodo,forthSpaceError
syn match forthComment '\.(\s[^)]*)' contains=forthTodo,forthSpaceError syn match forthComment '\.(\s[^)]*)' contains=@Spell,forthTodo,forthSpaceError
syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=forthTodo,forthSpaceError syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=@Spell,forthTodo,forthSpaceError
syn region forthComment start='/\*' end='\*/' contains=forthTodo,forthSpaceError syn region forthComment start='/\*' end='\*/' contains=@Spell,forthTodo,forthSpaceError
" Include files " Include files
syn match forthInclude '^INCLUDE\s\+\k\+' syn match forthInclude '^INCLUDE\s\+\k\+'
@ -260,3 +263,4 @@ let b:current_syntax = "forth"
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save
" vim:ts=8:sw=4:nocindent:smartindent: " vim:ts=8:sw=4:nocindent:smartindent:

View File

@ -2,6 +2,7 @@
" Language: gpg(1) configuration file " Language: gpg(1) configuration file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2010-10-14 " Latest Revision: 2010-10-14
" Updated: 2023-01-23 @ObserverOfTime: added a couple of keywords
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -55,6 +56,7 @@ syn keyword gpgOption contained skipwhite nextgroup=gpgArg
\ recipient s2k-cipher-algo s2k-digest-algo s2k-mode \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
\ secret-keyring set-filename set-policy-url status-fd \ secret-keyring set-filename set-policy-url status-fd
\ trusted-key verify-options keyid-format list-options \ trusted-key verify-options keyid-format list-options
\ default-new-key-algo weak-digest
syn keyword gpgOption contained skipwhite nextgroup=gpgArgError syn keyword gpgOption contained skipwhite nextgroup=gpgArgError
\ allow-freeform-uid allow-non-selfsigned-uid \ allow-freeform-uid allow-non-selfsigned-uid
\ allow-secret-key-import always-trust \ allow-secret-key-import always-trust

31
runtime/syntax/lc.vim Normal file
View File

@ -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'

View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: nginx.conf " Language: nginx.conf
" Maintainer: Chris Aumann <me@chr4.org> " Maintainer: Chris Aumann <me@chr4.org>
" Last Change: Apr 15, 2017 " Last Change: Jan 25, 2023
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -84,6 +84,8 @@ syn keyword ngxListenOptions default_server contained
syn keyword ngxListenOptions ssl contained syn keyword ngxListenOptions ssl contained
syn keyword ngxListenOptions http2 contained syn keyword ngxListenOptions http2 contained
syn keyword ngxListenOptions spdy 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 proxy_protocol contained
syn keyword ngxListenOptions setfib contained syn keyword ngxListenOptions setfib contained
syn keyword ngxListenOptions fastopen 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_field_size
syn keyword ngxDirective http2_max_header_size syn keyword ngxDirective http2_max_header_size
syn keyword ngxDirective http2_max_requests 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_buffer_size
syn keyword ngxDirective http2_recv_timeout 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 if_modified_since
syn keyword ngxDirective ignore_invalid_headers syn keyword ngxDirective ignore_invalid_headers
syn keyword ngxDirective image_filter syn keyword ngxDirective image_filter
@ -444,6 +454,10 @@ syn keyword ngxDirective proxy_temp_path
syn keyword ngxDirective proxy_timeout syn keyword ngxDirective proxy_timeout
syn keyword ngxDirective proxy_upload_rate syn keyword ngxDirective proxy_upload_rate
syn keyword ngxDirective queue 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 random_index
syn keyword ngxDirective read_ahead syn keyword ngxDirective read_ahead
syn keyword ngxDirective real_ip_header 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_certificate_key
syn keyword ngxDirective ssl_ciphers syn keyword ngxDirective ssl_ciphers
syn keyword ngxDirective ssl_client_certificate syn keyword ngxDirective ssl_client_certificate
syn keyword ngxDirective ssl_conf_command
syn keyword ngxDirective ssl_crl syn keyword ngxDirective ssl_crl
syn keyword ngxDirective ssl_dhparam syn keyword ngxDirective ssl_dhparam
syn keyword ngxDirective ssl_early_data
syn keyword ngxDirective ssl_ecdh_curve syn keyword ngxDirective ssl_ecdh_curve
syn keyword ngxDirective ssl_engine syn keyword ngxDirective ssl_engine
syn keyword ngxDirective ssl_handshake_timeout syn keyword ngxDirective ssl_handshake_timeout
@ -556,6 +572,7 @@ syn keyword ngxSSLPreferServerCiphersOn on contained
syn keyword ngxSSLPreferServerCiphersOff off contained syn keyword ngxSSLPreferServerCiphersOff off contained
syn keyword ngxDirective ssl_preread syn keyword ngxDirective ssl_preread
syn keyword ngxDirective ssl_protocols nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite 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' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite
syn match ngxSSLProtocol 'TLSv1\.1' 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 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_buffers
syn keyword ngxDirective uwsgi_busy_buffers_size syn keyword ngxDirective uwsgi_busy_buffers_size
syn keyword ngxDirective uwsgi_cache syn keyword ngxDirective uwsgi_cache
syn keyword ngxDirective uwsgi_cache_background_update
syn keyword ngxDirective uwsgi_cache_bypass syn keyword ngxDirective uwsgi_cache_bypass
syn keyword ngxDirective uwsgi_cache_key syn keyword ngxDirective uwsgi_cache_key
syn keyword ngxDirective uwsgi_cache_lock 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_check_status
syn keyword ngxDirectiveThirdParty xss_input_types 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 Module <https://www.nginx.com/resources/wiki/modules/zip/>
" ZIP archiver for nginx " ZIP archiver for nginx

View File

@ -2,8 +2,8 @@
" Language: shell (sh) Korn shell (ksh) bash (sh) " Language: shell (sh) Korn shell (ksh) bash (sh)
" Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
" Last Change: Nov 25, 2022 " Last Change: Dec 20, 2022
" Version: 204 " Version: 205
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
" For options and settings, please use: :help ft-sh-syntax " 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 " 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") if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
syn match shStatement "\<alias\>" 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 " Touch: {{{1
" ===== " =====
@ -333,7 +335,7 @@ syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shComment
" systems too, however, so the following syntax will flag $(..) as " systems too, however, so the following syntax will flag $(..) as
" an Error under /bin/sh. By consensus of vimdev'ers! " an Error under /bin/sh. By consensus of vimdev'ers!
if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") 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 region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList
syn match shSkipInitWS contained "^\s\+" syn match shSkipInitWS contained "^\s\+"
@ -483,7 +485,9 @@ endif
" Parameter Dereferencing: {{{1 " 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 syn match shDerefWordError "[^}$[~]" contained
endif endif
syn match shDerefSimple "\$\%(\h\w*\|\d\)" nextgroup=@shNoZSList syn match shDerefSimple "\$\%(\h\w*\|\d\)" nextgroup=@shNoZSList

View File

@ -1,2 +1,2 @@
This directory "runtime/syntax/shared" contains Vim script files that are 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.

View File

@ -2,8 +2,8 @@
" Language: tpp - Text Presentation Program " Language: tpp - Text Presentation Program
" Maintainer: Debian Vim Maintainers " Maintainer: Debian Vim Maintainers
" Former Maintainer: Gerfried Fuchs <alfie@ist.org> " Former Maintainer: Gerfried Fuchs <alfie@ist.org>
" Last Change: 2018 Dec 27 " Last Change: 2023 Jan 16
" URL: https://salsa.debian.org/vim-team/vim-debian/master/syntax/tpp.vim " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/tpp.vim
" Filenames: *.tpp " Filenames: *.tpp
" License: BSD " License: BSD
" "

View File

@ -1,9 +1,8 @@
" Vim syntax file " Vim syntax file
" This is a GENERATED FILE. Please always refer to source file at the URI below.
" Language: XF86Config (XFree86 configuration file) " Language: XF86Config (XFree86 configuration file)
" Former Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz> " Former Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
" Last Change: 2010 Nov 01 " Last Change By David: 2010 Nov 01
" URL: http://trific.ath.cx/Ftp/vim/syntax/xf86conf.vim " Last Change: 2023 Jan 23
" Required Vim Version: 6.0 " Required Vim Version: 6.0
" "
" Options: let xf86conf_xfree86_version = 3 or 4 " Options: let xf86conf_xfree86_version = 3 or 4
@ -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 Modes Ramdac Screen TextClockFreq UseModes VendorName nextgroup=xf86confComment,xf86confValue
syn keyword xf86confKeyword VertRefresh VideoRam ViewPort Virtual VScan VTimings 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 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 syn keyword xf86confModeLine ModeLine nextgroup=xf86confComment,xf86confModeLineValue skipwhite skipnl
" Constants " Constants
@ -185,6 +186,7 @@ hi def link xf86confOctalNumberError xf86confError
hi def link xf86confError Error hi def link xf86confError Error
hi def link xf86confOption xf86confKeyword hi def link xf86confOption xf86confKeyword
hi def link xf86confMatch xf86confKeyword
hi def link xf86confModeLine xf86confKeyword hi def link xf86confModeLine xf86confKeyword
hi def link xf86confKeyword Type hi def link xf86confKeyword Type