docs: update version.c

vim-patch:8.1.1919: using window options when passing a buffer to popup_create()
vim-patch:8.1.1954: more functions can be used as a method
vim-patch:8.1.1982: more functions can be used as methods
vim-patch:8.1.1986: more functions can be used as methods
vim-patch:8.1.1987: more functions can be used as methods
vim-patch:8.1.1993: more functions can be used as methods
vim-patch:8.1.1996: more functions can be used as methods
vim-patch:8.1.2004: more functions can be used as methods
vim-patch:8.1.2295: if buffer of popup is in another window cursorline sign shows

vim-patch:8.2.0568: the man filetype plugin overwrites the unnamed register
vim-patch:8.2.1186: with SGR mouse codes balloon doesn't show up after click
vim-patch:8.2.3539: GTK3: with 'rightleft' set scrollbar may move unintentionally
vim-patch:8.2.3681: cannot drag popup window after click on a status line
vim-patch:8.2.4561: build failure with some combination of features
vim-patch:8.2.4984: dragging statusline fails for window with winbar

vim-patch:9.0.0136: after CTRL-Left-mouse click a mouse scroll also has CTRL
vim-patch:9.0.0696: it is unclear if the +rightleft and +arabic features are used
vim-patch:9.0.0931: MS-Windows: mouse column limited to 223
vim-patch:9.0.1896: "below" virtual text doesn't work with 'rightleft'

build.zig.zon

@@ -61,8 +61,8 @@
             .hash = "N-V-__8AAI4YCgD7OqxCEAmz2RqT_ohl6eA4F0fGMtLIe7nb",
         },
         .treesitter_query = .{
-            .url = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?ref=v0.6.2#8a43889f89fd0667289936341bff3a77bafade17",
+            .url = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?ref=v0.7.0#60e253d3c9d6b1131a0f75c85e4bdcc9a48d5b42",
-            .hash = "N-V-__8AAARLBACBLGiXGFTijEzLv8AwiqT_kJpmVjir1BgX",
+            .hash = "N-V-__8AAGNUBAAvnkA99VqpVeC-dHymIp78MhFEixP8w7Tj",
         },
     },
     .paths = .{

cmake.deps/deps.txt

@@ -42,8 +42,8 @@ TREESITTER_VIM_URL https://github.com/tree-sitter-grammars/tree-sitter-vim/archi
 TREESITTER_VIM_SHA256 44eabc31127c4feacda19f2a05a5788272128ff561ce01093a8b7a53aadcc7b2
 TREESITTER_VIMDOC_URL https://github.com/neovim/tree-sitter-vimdoc/archive/v4.0.0.tar.gz
 TREESITTER_VIMDOC_SHA256 8096794c0f090b2d74b7bff94548ac1be3285b929ec74f839bd9b3ff4f4c6a0b
-TREESITTER_QUERY_URL https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.6.2.tar.gz
+TREESITTER_QUERY_URL https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.7.0.tar.gz
-TREESITTER_QUERY_SHA256 90682e128d048fbf2a2a17edca947db71e326fa0b3dba4136e041e096538b4eb
+TREESITTER_QUERY_SHA256 79285847e8350ee9fe1f6f6c9eb64bc14320f70f7b9b65037193fc58f2638613
 TREESITTER_MARKDOWN_URL https://github.com/tree-sitter-grammars/tree-sitter-markdown/archive/v0.5.0.tar.gz
 TREESITTER_MARKDOWN_SHA256 14c2c948ccf0e9b606eec39b09286c59dddf28307849f71b7ce2b1d1ef06937e
 TREESITTER_URL https://github.com/tree-sitter/tree-sitter/archive/v0.25.9.tar.gz

runtime/ftplugin/nu.vim

@@ -1,13 +1,17 @@
 " Vim filetype plugin
-" Language:	Nu
+" Language:	Nushell
-" Maintainer:	Marc Jakobi <marc@jakobi.dev>
+" Maintainer:	El Kasztano
-" Last Change:	2024 Aug 31
+" URL:		https://github.com/elkasztano/nushell-syntax-vim
+" License:	MIT <https://opensource.org/license/mit>
+" Last Change:	2025 Sep 05
 
-if exists('b:did_ftplugin')
+if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=#\ %s
+setlocal comments-=://
+setlocal formatoptions=tcroql
 
-let b:undo_ftplugin = 'setl com<'
+let b:undo_ftplugin = "setl fo< cms< com<"

runtime/indent/nu.vim

@@ -0,0 +1,54 @@
+" Vim indent file
+" Language:	Nushell
+" Maintainer:	El Kasztano
+" URL:		https://github.com/elkasztano/nushell-syntax-vim
+" License:	MIT <https://opensource.org/license/mit>
+" Last Change:	2025 Sep 05
+
+" Only load if no other indent file is loaded
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal cindent
+setlocal cinoptions=L0,(s,Ws,J1,j1,+0,f5,m1,i0
+setlocal cinkeys=0{,0},!^F,o,O,0[,0],0),0#
+
+setlocal autoindent
+setlocal indentkeys=0{,0},!^F,o,O,0[,0],0),0#
+
+setlocal shiftwidth=2
+setlocal softtabstop=2
+setlocal expandtab
+
+setlocal indentexpr=GetNuIndent(v:lnum)
+
+let b:undo_indent = "setl ai< cin< cink< cino< et< inde< indk< sts< sw<"
+
+" only define once
+if exists("*GetNuIndent")
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function GetNuIndent(lnum)
+	let prevlnum = prevnonblank(v:lnum - 1) "get number of last non blank line
+	let line = getline(a:lnum)
+	let synname = synIDattr(synID(a:lnum, 1, 1), "name")
+	if (synname == "nuString") || (synname == "nuComment")
+		return -1
+	endif
+	if getline(prevlnum) =~ '\%(^.*[$\|^.*[\s*#.*$\)'
+		return (prevlnum > 0) * indent(prevlnum) + shiftwidth()
+	endif
+	if getline(v:lnum) =~ "^\s*]\>"
+		return (prevlnum > 0) * indent(prevlnum) - shiftwidth()
+	endif
+	return cindent(a:lnum)
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/syntax/m4.vim

@@ -4,10 +4,8 @@
 " Last Change:	2022 Jun 12
 " 2025 Sep 2 by Vim project: fix a few syntax issues #18192
 " 2025 Sep 5 by Vim project: introduce m4Disabled region #18200
-
+" 2025 Sep 6 by Vim project: remove m4Function heuristics #18211
-" This file will highlight user function calls if they use only
+" 2025 Sep 6 by Vim project: remove m4Type and m4Function #18223
-" capital letters and have at least one argument (i.e. the '('
-" must be there). Let me know if this is a problem.
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -45,6 +43,13 @@ syn region m4Quoted
 " – Comments themselves are disabled when quoted.
 syn region m4Disabled start=+#+ end=+$+ containedin=ALLBUT,m4Quoted
 
+" Macros in M4:
+" – Name tokens consist of the longest possible sequence of letters, digits,
+"   and underscores, where the first character is not a digit.
+" – In GNU M4, this can be altered with changeword().
+" – Any name token may be defined as a macro and quoting prevents expansion.
+"   Thus correct highlighting requires running M4.
+
 " define the m4 syntax
 syn match  m4Variable contained "\$\d\+"
 syn match  m4Special  contained "$[@*#]"
@@ -53,26 +58,24 @@ syn match  m4Constants "\<\(m4_\)\=__file__"
 syn match  m4Constants "\<\(m4_\)\=__line__"
 syn keyword m4Constants divnum sysval m4_divnum m4_sysval
 syn region m4Paren    matchgroup=m4Delimiter start="(" end=")" contained contains=@m4Top
-syn region m4Command  matchgroup=m4Function  start="\<\(m4_\)\=\(define\|defn\|pushdef\)(" end=")" contains=@m4Top
+syn region m4Command  matchgroup=m4Define  start="\<\(m4_\)\=\(define\|defn\|pushdef\)(" end=")" contains=@m4Top
 syn region m4Command  matchgroup=m4Preproc   start="\<\(m4_\)\=\(include\|sinclude\)("he=e-1 end=")" contains=@m4Top
 syn region m4Command  matchgroup=m4Statement start="\<\(m4_\)\=\(syscmd\|esyscmd\|ifdef\|ifelse\|indir\|builtin\|shift\|errprint\|m4exit\|changecom\|changequote\|changeword\|m4wrap\|debugfile\|divert\|undivert\)("he=e-1 end=")" contains=@m4Top
 syn region m4Command  matchgroup=m4Builtin start="\<\(m4_\)\=\(len\|index\|regexp\|substr\|translit\|patsubst\|format\|incr\|decr\|eval\|maketemp\)("he=e-1 end=")" contains=@m4Top
 syn keyword m4Statement divert undivert
-syn region m4Command  matchgroup=m4Type      start="\<\(m4_\)\=\(undefine\|popdef\)("he=e-1 end=")" contains=@m4Top
+syn region m4Command  matchgroup=m4Define      start="\<\(m4_\)\=\(undefine\|popdef\)("he=e-1 end=")" contains=@m4Top
-syn region m4Function matchgroup=m4Type      start="\<[_A-Z][_A-Z0-9]*("he=e-1 end=")" contains=@m4Top
+syn cluster m4Top     contains=m4Comment,m4Constants,m4Special,m4Variable,m4Paren,m4Command,m4Statement,m4Quoted
-syn cluster m4Top     contains=m4Comment,m4Constants,m4Special,m4Variable,m4Paren,m4Command,m4Statement,m4Function,m4Quoted
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 hi def link m4QuoteDelim  Delimiter
 hi def link m4Delimiter   Delimiter
 hi def link m4Comment     Comment
-hi def link m4Function    Function
 hi def link m4Keyword     Keyword
+hi def link m4Define      Define
 hi def link m4Special     Special
 hi def link m4Statement   Statement
 hi def link m4Preproc     PreProc
-hi def link m4Type        Type
 hi def link m4Variable    Special
 hi def link m4Constants   Constant
 hi def link m4Builtin     Statement

runtime/syntax/nu.vim

@@ -0,0 +1,720 @@
+" Vim syntax file
+" Language:	Nushell
+" Maintainer:	El Kasztano
+" URL:		https://github.com/elkasztano/nushell-syntax-vim
+" License:	MIT <https://opensource.org/license/mit>
+" Last Change:	2025 Sep 05
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn iskeyword @,192-255,-,_
+
+syn match nuCmd "\<alias\>" display
+syn match nuCmd "\<all\>" display
+syn match nuCmd "\<ansi\>" display
+syn match nuCmd "\<ansi gradient\>" display
+syn match nuCmd "\<ansi link\>" display
+syn match nuCmd "\<ansi strip\>" display
+syn match nuCmd "\<any\>" display
+syn match nuCmd "\<append\>" display
+syn match nuCmd "\<ast\>" display
+syn match nuCmd "\<banner\>" display
+syn match nuCmd "\<bits\>" display
+syn match nuCmd "\<bits and\>" display
+syn match nuCmd "\<bits not\>" display
+syn match nuCmd "\<bits or\>" display
+syn match nuCmd "\<bits rol\>" display
+syn match nuCmd "\<bits ror\>" display
+syn match nuCmd "\<bits shl\>" display
+syn match nuCmd "\<bits shr\>" display
+syn match nuCmd "\<bits xor\>" display
+syn match nuCmd "\<break\>" display
+syn match nuCmd "\<bytes\>" display
+syn match nuCmd "\<bytes add\>" display
+syn match nuCmd "\<bytes at\>" display
+syn match nuCmd "\<bytes build\>" display
+syn match nuCmd "\<bytes collect\>" display
+syn match nuCmd "\<bytes ends-with\>" display
+syn match nuCmd "\<bytes index-of\>" display
+syn match nuCmd "\<bytes length\>" display
+syn match nuCmd "\<bytes remove\>" display
+syn match nuCmd "\<bytes replace\>" display
+syn match nuCmd "\<bytes reverse\>" display
+syn match nuCmd "\<bytes starts-with\>" display
+syn match nuCmd "\<cal\>" display
+syn match nuCmd "\<cd\>" display
+syn match nuCmd "\<char\>" display
+syn match nuCmd "\<clear\>" display
+syn match nuCmd "\<collect\>" display
+syn match nuCmd "\<columns\>" display
+syn match nuCmd "\<commandline\>" display
+syn match nuCmd "\<compact\>" display
+syn match nuCmd "\<complete\>" display
+syn match nuCmd "\<config\>" display
+syn match nuCmd "\<config env\>" display
+syn match nuCmd "\<config nu\>" display
+syn match nuCmd "\<config reset\>" display
+syn match nuCmd "\<const\>" nextgroup=nuIdtfr,nuSubCmd,nuDefflag skipwhite display
+syn match nuCmd "\<continue\>" display
+syn match nuCmd "\<cp\>" display
+syn match nuCmd "\<cp-old\>" display
+syn match nuCmd "\<create_left_prompt\>" display
+syn match nuCmd "\<create_right_prompt\>" display
+syn match nuCmd "\<date\>" display
+syn match nuCmd "\<date format\>" display
+syn match nuCmd "\<date humanize\>" display
+syn match nuCmd "\<date list-timezone\>" display
+syn match nuCmd "\<date now\>" display
+syn match nuCmd "\<date to-record\>" display
+syn match nuCmd "\<date to-table\>" display
+syn match nuCmd "\<date to-timezone\>" display
+syn match nuCmd "\<debug\>" display
+syn match nuCmd "\<debug info\>" display
+syn match nuCmd "\<decode\>" display
+syn match nuCmd "\<decode base64\>" display
+syn match nuCmd "\<decode hex\>" display
+syn match nuCmd "\<def\>" nextgroup=nuIdtfr,nuSubCmd,nuDefflag skipwhite display
+syn match nuCmd "\<def-env\>" nextgroup=nuIdtfr,nuSubCmd,nuDefflag skipwhite display
+syn match nuCmd "\<default\>" display
+syn match nuCmd "\<describe\>" display
+syn match nuCmd "\<detect columns\>" display
+syn match nuCmd "\<drop\>" display
+syn match nuCmd "\<dfr\>" display
+syn match nuCmd "\<dfr agg\>" display
+syn match nuCmd "\<dfr agg-groups\>" display
+syn match nuCmd "\<dfr all-false\>" display
+syn match nuCmd "\<dfr all-true\>" display
+syn match nuCmd "\<dfr append\>" display
+syn match nuCmd "\<dfr arg-max\>" display
+syn match nuCmd "\<dfr arg-min\>" display
+syn match nuCmd "\<dfr arg-sort\>" display
+syn match nuCmd "\<dfr arg-true\>" display
+syn match nuCmd "\<dfr arg-unique\>" display
+syn match nuCmd "\<dfr arg-where\>" display
+syn match nuCmd "\<dfr as\>" display
+syn match nuCmd "\<dfr as-date\>" display
+syn match nuCmd "\<dfr as-datetime\>" display
+syn match nuCmd "\<dfr cache\>" display
+syn match nuCmd "\<dfr col\>" display
+syn match nuCmd "\<dfr collect\>" display
+syn match nuCmd "\<dfr columns\>" display
+syn match nuCmd "\<dfr concat-str\>" display
+syn match nuCmd "\<dfr concatenate\>" display
+syn match nuCmd "\<dfr contains\>" display
+syn match nuCmd "\<dfr count\>" display
+syn match nuCmd "\<dfr count-null\>" display
+syn match nuCmd "\<dfr cumulative\>" display
+syn match nuCmd "\<dfr datepart\>" display
+syn match nuCmd "\<dfr drop\>" display
+syn match nuCmd "\<dfr drop-duplicates\>" display
+syn match nuCmd "\<dfr drop-nulls\>" display
+syn match nuCmd "\<dfr dtypes\>" display
+syn match nuCmd "\<dfr dummies\>" display
+syn match nuCmd "\<dfr explode\>" display
+syn match nuCmd "\<dfr expr-not\>" display
+syn match nuCmd "\<dfr fetch\>" display
+syn match nuCmd "\<dfr fill-nan\>" display
+syn match nuCmd "\<dfr fill-null\>" display
+syn match nuCmd "\<dfr filter\>" display
+syn match nuCmd "\<dfr filter-with\>" display
+syn match nuCmd "\<dfr first\>" display
+syn match nuCmd "\<dfr flatten\>" display
+syn match nuCmd "\<dfr get\>" display
+syn match nuCmd "\<dfr get-day\>" display
+syn match nuCmd "\<dfr get-hour\>" display
+syn match nuCmd "\<dfr get-minute\>" display
+syn match nuCmd "\<dfr get-month\>" display
+syn match nuCmd "\<dfr get-nanosecond\>" display
+syn match nuCmd "\<dfr get-ordinal\>" display
+syn match nuCmd "\<dfr get-second\>" display
+syn match nuCmd "\<dfr get-week\>" display
+syn match nuCmd "\<dfr get-weekday\>" display
+syn match nuCmd "\<dfr get-year\>" display
+syn match nuCmd "\<dfr group-by\>" display
+syn match nuCmd "\<dfr implode\>" display
+syn match nuCmd "\<dfr into-df\>" display
+syn match nuCmd "\<dfr into-lazy\>" display
+syn match nuCmd "\<dfr into-nu\>" display
+syn match nuCmd "\<dfr is-duplicated\>" display
+syn match nuCmd "\<dfr is-in\>" display
+syn match nuCmd "\<dfr is-not-null\>" display
+syn match nuCmd "\<dfr is-null\>" display
+syn match nuCmd "\<dfr is-unique\>" display
+syn match nuCmd "\<dfr join\>" display
+syn match nuCmd "\<dfr last\>" display
+syn match nuCmd "\<dfr lit\>" display
+syn match nuCmd "\<dfr lowercase\>" display
+syn match nuCmd "\<dfr ls\>" display
+syn match nuCmd "\<dfr max\>" display
+syn match nuCmd "\<dfr mean\>" display
+syn match nuCmd "\<dfr median\>" display
+syn match nuCmd "\<dfr melt\>" display
+syn match nuCmd "\<dfr min\>" display
+syn match nuCmd "\<dfr n-unique\>" display
+syn match nuCmd "\<dfr not\>" display
+syn match nuCmd "\<dfr open\>" display
+syn match nuCmd "\<dfr otherwise\>" display
+syn match nuCmd "\<dfr quantile\>" display
+syn match nuCmd "\<dfr query\>" display
+syn match nuCmd "\<dfr rename\>" display
+syn match nuCmd "\<dfr replace\>" display
+syn match nuCmd "\<dfr replace-all\>" display
+syn match nuCmd "\<dfr reverse\>" display
+syn match nuCmd "\<dfr rolling\>" display
+syn match nuCmd "\<dfr sample\>" display
+syn match nuCmd "\<dfr select\>" display
+syn match nuCmd "\<dfr set\>" display
+syn match nuCmd "\<dfr set-with-idx\>" display
+syn match nuCmd "\<dfr shape\>" display
+syn match nuCmd "\<dfr shift\>" display
+syn match nuCmd "\<dfr slice\>" display
+syn match nuCmd "\<dfr sort-by\>" display
+syn match nuCmd "\<dfr std\>" display
+syn match nuCmd "\<dfr str-lengths\>" display
+syn match nuCmd "\<dfr str-slice\>" display
+syn match nuCmd "\<dfr strftime\>" display
+syn match nuCmd "\<dfr sum\>" display
+syn match nuCmd "\<dfr summary\>" display
+syn match nuCmd "\<dfr take\>" display
+syn match nuCmd "\<dfr to-arrow\>" display
+syn match nuCmd "\<dfr to-avro\>" display
+syn match nuCmd "\<dfr to-csv\>" display
+syn match nuCmd "\<dfr to-jsonl\>" display
+syn match nuCmd "\<dfr to-parquet\>" display
+syn match nuCmd "\<dfr unique\>" display
+syn match nuCmd "\<dfr uppercase\>" display
+syn match nuCmd "\<dfr value-counts\>" display
+syn match nuCmd "\<dfr var\>" display
+syn match nuCmd "\<dfr when\>" display
+syn match nuCmd "\<dfr with-column\>" display
+syn match nuCmd "\<do\>" display
+syn match nuCmd "\<drop\>" display
+syn match nuCmd "\<drop column\>" display
+syn match nuCmd "\<drop nth\>" display
+syn match nuCmd "\<du\>" display
+syn match nuCmd "\<each\>" display
+syn match nuCmd "\<each while\>" display
+syn match nuCmd "\<echo\>" display
+syn match nuCmd "\<encode\>" display
+syn match nuCmd "\<encode base64\>" display
+syn match nuCmd "\<encode hex\>" display
+syn match nuCmd "\<add\>" display
+syn match nuCmd "\<enumerate\>" display
+syn match nuCmd "\<error make\>" display
+syn match nuCmd "\<every\>" display
+syn match nuCmd "\<exec\>" display
+syn match nuCmd "\<exit\>" display
+syn match nuCmd "\<explain\>" display
+syn match nuCmd "\<explore\>" display
+syn match nuCmd "\<export\>" display
+syn match nuCmd "\<export alias\>" display
+syn match nuCmd "\<export const\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<export def\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<export def-env\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<export extern\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<export extern-wrapped\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<export module\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<export use\>" display
+syn match nuCmd "\<export-env\>" display
+syn match nuCmd "\<extern\>" display
+syn match nuCmd "\<extern-wrapped\>" display
+syn match nuCmd "\<fill\>" display
+syn match nuCmd "\<filter\>" display
+syn match nuCmd "\<find\>" display
+syn match nuCmd "\<first\>" display
+syn match nuCmd "\<flatten\>" display
+syn match nuCmd "\<fmt\>" display
+syn match nuCmd "\<for\>" display
+syn match nuCmd "\<format\>" display
+syn match nuCmd "\<format date\>" display
+syn match nuCmd "\<format duration\>" display
+syn match nuCmd "\<format filesize\>" display
+syn match nuCmd "\<from\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<from csv\>" display
+syn match nuCmd "\<from json\>" display
+syn match nuCmd "\<from nuon\>" display
+syn match nuCmd "\<from ods\>" display
+syn match nuCmd "\<from ssv\>" display
+syn match nuCmd "\<from toml\>" display
+syn match nuCmd "\<from tsv\>" display
+syn match nuCmd "\<from url\>" display
+syn match nuCmd "\<from xlsx\>" display
+syn match nuCmd "\<from xml\>" display
+syn match nuCmd "\<from yaml\>" display
+syn match nuCmd "\<from yml\>" display
+syn match nuCmd "\<goto\>" display
+syn match nuCmd "\<get\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<glob\>" display
+syn match nuCmd "\<grid\>" display
+syn match nuCmd "\<group\>" display
+syn match nuCmd "\<group-by\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<hash\>" display
+syn match nuCmd "\<hash md5\>" display
+syn match nuCmd "\<hash sha256\>" display
+syn match nuCmd "\<headers\>" display
+syn match nuCmd "\<help\>" display
+syn match nuCmd "\<help aliases\>" display
+syn match nuCmd "\<help commands\>" display
+syn match nuCmd "\<help escapes\>" display
+syn match nuCmd "\<help externs\>" display
+syn match nuCmd "\<help modules\>" display
+syn match nuCmd "\<help operators\>" display
+syn match nuCmd "\<hide\>" display
+syn match nuCmd "\<hide-env\>" display
+syn match nuCmd "\<histogram\>" display
+syn match nuCmd "\<history\>" display
+syn match nuCmd "\<history session\>" display
+syn match nuCmd "\<http\> " display
+syn match nuCmd "\<http delete\>" display
+syn match nuCmd "\<http get\>" display
+syn match nuCmd "\<http head\>" display
+syn match nuCmd "\<http options\>" display
+syn match nuCmd "\<http patch\>" display
+syn match nuCmd "\<http post\>" display
+syn match nuCmd "\<http put\>" display
+syn match nuCmd "\<if\>" display
+syn match nuCmd "\<ignore\>" display
+syn match nuCmd "\<input\>" display
+syn match nuCmd "\<input list\>" display
+syn match nuCmd "\<input listen\>" display
+syn match nuCmd "\<insert\>" display
+syn match nuCmd "\<inspect\>" display
+syn match nuCmd "\<into\>" display
+syn match nuCmd "\<into binary\>" display
+syn match nuCmd "\<into bits\>" display
+syn match nuCmd "\<into bool\>" display
+syn match nuCmd "\<into datetime\>" display
+syn match nuCmd "\<into duration\>" display
+syn match nuCmd "\<into filesize\>" display
+syn match nuCmd "\<into float\>" display
+syn match nuCmd "\<into int\>" display
+syn match nuCmd "\<into record\>" display
+syn match nuCmd "\<into sqlite\>" display
+syn match nuCmd "\<into string\>" display
+syn match nuCmd "\<into value\>" display
+syn match nuCmd "\<is-admin\>" display
+syn match nuCmd "\<is-empty\>" display
+syn match nuCmd "\<items\>" display
+syn match nuCmd "\<join\>" display
+syn match nuCmd "\<keybindings\>" display
+syn match nuCmd "\<keybindings default\>" display
+syn match nuCmd "\<keybindings list\>" display
+syn match nuCmd "\<keybindings listen\>" display
+syn match nuCmd "\<kill\>" display
+syn match nuCmd "\<last\>" display
+syn match nuCmd "\<lazy make\>" display
+syn match nuCmd "\<length\>" display
+syn match nuCmd "\<let\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<let-env\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<lines\>" display
+syn match nuCmd "\<load-env\>" display
+syn match nuCmd "\<loop\>" display
+syn match nuCmd "\<ls\>" display
+syn match nuCmd "\<match\>" display
+syn match nuCmd "\<math\>" display
+syn match nuCmd "\<math abs\>" display
+syn match nuCmd "\<math arccos\>" display
+syn match nuCmd "\<math arccosh\>" display
+syn match nuCmd "\<math arcsin\>" display
+syn match nuCmd "\<math arcsinh\>" display
+syn match nuCmd "\<math arctan\>" display
+syn match nuCmd "\<math arctanh\>" display
+syn match nuCmd "\<math avg\>" display
+syn match nuCmd "\<math ceil\>" display
+syn match nuCmd "\<math cos\>" display
+syn match nuCmd "\<math cosh\>" display
+syn match nuCmd "\<math exp\>" display
+syn match nuCmd "\<math floor\>" display
+syn match nuCmd "\<math ln\>" display
+syn match nuCmd "\<math log\>" display
+syn match nuCmd "\<math max\>" display
+syn match nuCmd "\<math median\>" display
+syn match nuCmd "\<math min\>" display
+syn match nuCmd "\<math mode\>" display
+syn match nuCmd "\<math product\>" display
+syn match nuCmd "\<math round\>" display
+syn match nuCmd "\<math sin\>" display
+syn match nuCmd "\<math sinh\>" display
+syn match nuCmd "\<math sqrt\>" display
+syn match nuCmd "\<math stddev\>" display
+syn match nuCmd "\<math sum\>" display
+syn match nuCmd "\<math tan\>" display
+syn match nuCmd "\<math tanh\>" display
+syn match nuCmd "\<math variance\>" display
+syn match nuCmd "\<merge\>" display
+syn match nuCmd "\<metadata\>" display
+syn match nuCmd "\<mkdir\>" display
+syn match nuCmd "\<module\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<move\>" display
+syn match nuCmd "\<mut\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<mv\>" display
+syn match nuCmd "\<next\>" display
+syn match nuCmd "\<nu-check\>" display
+syn match nuCmd "\<nu-highlight\>" display
+syn match nuCmd "\<open\>" display
+syn match nuCmd "\<overlay\>" display
+syn match nuCmd "\<overlay hide\>" display
+syn match nuCmd "\<overlay list\>" display
+syn match nuCmd "\<overlay new\>" display
+syn match nuCmd "\<overlay use\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<prev\>" display
+syn match nuCmd "\<par-each\>" display
+syn match nuCmd "\<parse\>" display
+syn match nuCmd "\<path\>" display
+syn match nuCmd "\<path basename\>" display
+syn match nuCmd "\<path dirname\>" display
+syn match nuCmd "\<path exists\>" display
+syn match nuCmd "\<path expand\>" display
+syn match nuCmd "\<path join\>" display
+syn match nuCmd "\<path parse\>" display
+syn match nuCmd "\<path relative-to\>" display
+syn match nuCmd "\<path split\>" display
+syn match nuCmd "\<path type\>" display
+syn match nuCmd "\<port\>" display
+syn match nuCmd "\<prepend\>" display
+syn match nuCmd "\<print\>" display
+syn match nuCmd "\<profile\>" display
+syn match nuCmd "\<ps\>" display
+syn match nuCmd "\<pwd\>" display
+syn match nuCmd "\<query db\>" display
+syn match nuCmd "\<random\>" display
+syn match nuCmd "\<random bool\>" display
+syn match nuCmd "\<random chars\>" display
+syn match nuCmd "\<random dice\>" display
+syn match nuCmd "\<random float\>" display
+syn match nuCmd "\<random int\>" display
+syn match nuCmd "\<random integer\>" display
+syn match nuCmd "\<random uuid\>" display
+syn match nuCmd "\<range\>" display
+syn match nuCmd "\<reduce\>" display
+syn match nuCmd "\<register\>" display
+syn match nuCmd "\<reject\>" display
+syn match nuCmd "\<rename\>" display
+syn match nuCmd "\<return\>" display
+syn match nuCmd "\<reverse\>" display
+syn match nuCmd "\<rm\>" display
+syn match nuCmd "\<roll\>" display
+syn match nuCmd "\<roll down\>" display
+syn match nuCmd "\<roll left\>" display
+syn match nuCmd "\<roll right\>" display
+syn match nuCmd "\<roll up\>" display
+syn match nuCmd "\<rotate\>" display
+syn match nuCmd "\<run-external\>" display
+syn match nuCmd "\<save\>" display
+syn match nuCmd "\<schema\>" display
+syn match nuCmd "\<scope\>" display
+syn match nuCmd "\<scope aliases\>" display
+syn match nuCmd "\<scope commands\>" display
+syn match nuCmd "\<scope engine-stats\>" display
+syn match nuCmd "\<scope externs\>" display
+syn match nuCmd "\<scope modules\>" display
+syn match nuCmd "\<scope variables\>" display
+syn match nuCmd "\<select\>" display
+syn match nuCmd "\<seq\>" display
+syn match nuCmd "\<seq char\>" display
+syn match nuCmd "\<seq date\>" display
+syn match nuCmd "\<show\>" display
+syn match nuCmd "\<shuffle\>" display
+syn match nuCmd "\<size\>" display
+syn match nuCmd "\<skip\>" display
+syn match nuCmd "\<skip until\>" display
+syn match nuCmd "\<skip while\>" display
+syn match nuCmd "\<sleep\>" display
+syn match nuCmd "\<sort\>" display
+syn match nuCmd "\<sort-by\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<source\>" display
+syn match nuCmd "\<source-env\>" display
+syn match nuCmd "\<split\>" display
+syn match nuCmd "\<split chars\>" display
+syn match nuCmd "\<split column\>" display
+syn match nuCmd "\<split list\>" display
+syn match nuCmd "\<split row\>" display
+syn match nuCmd "\<split words\>" display
+syn match nuCmd "\<split-by\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<start\>" display
+syn match nuCmd "\<str\>" display
+syn match nuCmd "\<str camel-case\>" display
+syn match nuCmd "\<str capitalize\>" display
+syn match nuCmd "\<str contains\>" display
+syn match nuCmd "\<str distance\>" display
+syn match nuCmd "\<str downcase\>" display
+syn match nuCmd "\<str ends-with\>" display
+syn match nuCmd "\<str expand\>" display
+syn match nuCmd "\<str index-of\>" display
+syn match nuCmd "\<str join\>" display
+syn match nuCmd "\<str kebab-case\>" display
+syn match nuCmd "\<str length\>" display
+syn match nuCmd "\<str pascal-case\>" display
+syn match nuCmd "\<str replace\>" display
+syn match nuCmd "\<str reverse\>" display
+syn match nuCmd "\<str screaming-snake-case\>" display
+syn match nuCmd "\<str snake-case\>" display
+syn match nuCmd "\<str starts-with\>" display
+syn match nuCmd "\<str substring\>" display
+syn match nuCmd "\<str title-case\>" display
+syn match nuCmd "\<str trim\>" display
+syn match nuCmd "\<str upcase\>" display
+syn match nuCmd "\<sys\>" display
+syn match nuCmd "\<sys cpu\>" display
+syn match nuCmd "\<sys disks\>" display
+syn match nuCmd "\<sys host\>" display
+syn match nuCmd "\<sys mem\>" display
+syn match nuCmd "\<sys net\>" display
+syn match nuCmd "\<sys temp\>" display
+syn match nuCmd "\<sys users\>" display
+syn match nuCmd "\<table\>" display
+syn match nuCmd "\<take\>" display
+syn match nuCmd "\<take until\>" display
+syn match nuCmd "\<take while\>" display
+syn match nuCmd "\<term size\>" display
+syn match nuCmd "\<timeit\>" display
+syn match nuCmd "\<to\>" display
+syn match nuCmd "\<to csv\>" display
+syn match nuCmd "\<to html\>" display
+syn match nuCmd "\<to json\>" display
+syn match nuCmd "\<to md\>" display
+syn match nuCmd "\<to nuon\>" display
+syn match nuCmd "\<to text\>" display
+syn match nuCmd "\<to toml\>" display
+syn match nuCmd "\<to tsv\>" display
+syn match nuCmd "\<to xml\>" display
+syn match nuCmd "\<to yaml\>" display
+syn match nuCmd "\<touch\>" display
+syn match nuCmd "\<transpose\>" display
+syn match nuCmd "\<try\>" display
+syn match nuCmd "\<tutor\>" display
+syn match nuCmd "\<unfold\>" display
+syn match nuCmd "\<uniq\>" display
+syn match nuCmd "\<uniq-by\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<update\>" display
+syn match nuCmd "\<update cells\>" display
+syn match nuCmd "\<upsert\>" display
+syn match nuCmd "\<url\>" display
+syn match nuCmd "\<url build-query\>" display
+syn match nuCmd "\<url decode\>" display
+syn match nuCmd "\<url encode\>" display
+syn match nuCmd "\<url join\>" display
+syn match nuCmd "\<url parse\>" display
+syn match nuCmd "\<use\>" nextgroup=nuIdtfr skipwhite display
+syn match nuCmd "\<values\>" display
+syn match nuCmd "\<version\>" display
+syn match nuCmd "\<view\>" display
+syn match nuCmd "\<view files\>" display
+syn match nuCmd "\<view source\>" display
+syn match nuCmd "\<view span\>" display
+syn match nuCmd "\<watch\>" display
+syn match nuCmd "\<where\>" nextgroup=nuPrpty skipwhite display
+syn match nuCmd "\<which\>" display
+syn match nuCmd "\<while\>" display
+syn match nuCmd "\<whoami\>" display
+syn match nuCmd "\<window\>" display
+syn match nuCmd "\<with-env\>" display
+syn match nuCmd "\<wrap\>" display
+syn match nuCmd "\<zip\>" display
+syn match nuCmd "\<exists\>" display
+syn match nuCmd "\<attr category\>" display
+syn match nuCmd "\<attr example\>" display
+syn match nuCmd "\<attr search-terms\>" display
+syn match nuCmd "\<bytes split\>" display
+syn match nuCmd "\<chunk-by\>" display
+syn match nuCmd "\<chunks\>" display
+syn match nuCmd "\<commandline edit\>" display
+syn match nuCmd "\<commandline get-cursor\>" display
+syn match nuCmd "\<commandline set-cursor\>" display
+syn match nuCmd "\<config flatten\>" display
+syn match nuCmd "\<config use-colors\>" display
+syn match nuCmd "\<date from-human\>" display
+syn match nuCmd "\<debug profile\>" display
+syn match nuCmd "\<decode base32\>" display
+syn match nuCmd "\<decode base32hex\>" display
+syn match nuCmd "\<encode base32\>" display
+syn match nuCmd "\<encode base32hex\>" display
+syn match nuCmd "\<format bits\>" display
+syn match nuCmd "\<format number\>" display
+syn match nuCmd "\<format pattern\>" display
+syn match nuCmd "\<from msgpack\>" display
+syn match nuCmd "\<from msgpackz\>" display
+syn match nuCmd "\<generate\>" display
+syn match nuCmd "\<help pipe-and-redirect\>" display
+syn match nuCmd "\<history import\>" display
+syn match nuCmd "\<interleave\>" display
+syn match nuCmd "\<into cell-path\>" display
+syn match nuCmd "\<into glob\>" display
+syn match nuCmd "\<is-not-empty\>" display
+syn match nuCmd "\<is-terminal\>" display
+syn match nuCmd "\<job\>" display
+syn match nuCmd "\<job flush\>" display
+syn match nuCmd "\<job id\>" display
+syn match nuCmd "\<job kill\>" display
+syn match nuCmd "\<job list\>" display
+syn match nuCmd "\<job recv\>" display
+syn match nuCmd "\<job send\>" display
+syn match nuCmd "\<job spawn\>" display
+syn match nuCmd "\<job tag\>" display
+syn match nuCmd "\<job unfreeze\>" display
+syn match nuCmd "\<merge deep\>" display
+syn match nuCmd "\<metadata access\>" display
+syn match nuCmd "\<metadata set\>" display
+syn match nuCmd "\<mktemp\>" display
+syn match nuCmd "\<panic\>" display
+syn match nuCmd "\<path self\>" display
+syn match nuCmd "\<plugin\>" display
+syn match nuCmd "\<plugin add\>" display
+syn match nuCmd "\<plugin list\>" display
+syn match nuCmd "\<plugin rm\>" display
+syn match nuCmd "\<plugin stop\>" display
+syn match nuCmd "\<plugin use\>" display
+syn match nuCmd "\<random binary\>" display
+syn match nuCmd "\<split cell-path\>" display
+syn match nuCmd "\<stor create\>" display
+syn match nuCmd "\<stor delete\>" display
+syn match nuCmd "\<stor export\>" display
+syn match nuCmd "\<stor import\>" display
+syn match nuCmd "\<stor insert\>" display
+syn match nuCmd "\<stor open\>" display
+syn match nuCmd "\<stor reset\>" display
+syn match nuCmd "\<stor update\>" display
+syn match nuCmd "\<str stats\>" display
+syn match nuCmd "\<tee\>" display
+syn match nuCmd "\<term query\>" display
+syn match nuCmd "\<to msgpack\>" display
+syn match nuCmd "\<to msgpackz\>" display
+syn match nuCmd "\<to yml\>" display
+syn match nuCmd "\<ulimit\>" display
+syn match nuCmd "\<uname\>" display
+syn match nuCmd "\<url split-query\>" display
+syn match nuCmd "\<version check\>" display
+syn match nuCmd "\<view blocks\>" display
+syn match nuCmd "\<view ir\>" display
+
+syn match nuNumber "\([a-zA-Z_\.]\+\d*\)\@<!\d\+" nextgroup=nuUnit,nuDur
+syn match nuNumber "\([a-zA-Z]\)\@<!\.\d\+" nextgroup=nuUnit,nuDur
+syn match nuNumber "\([a-zA-Z]\)\@<!_\d\+" nextgroup=nuUnit,nuDur,nuNumber
+syn match nuNumber "\d\+[eE][+-]\?\d\+" nextgroup=nuUnit,nuDur
+syn match nuNumber "\d\+\.\d\+[eE]\?[+-]\d\+" nextgroup=nuUnit,nuDur
+
+syn keyword nuTodo contained TODO FIXME NOTE
+syn match nuComment "#.*$" contains=nuTodo
+
+syn match nuOp "=" display
+syn match nuOp "-" display
+syn match nuOp "?" display
+syn match nuOp "<" display
+syn match nuOp ">" display
+syn match nuOp "+" display
+syn match nuOp "/" display
+syn match nuOp "\*" display
+syn match nuOp "!=" display
+syn match nuOp "=\~" display
+syn match nuOp "\!\~" display
+syn match nuOp "\<in\>" nextgroup=nuPrpty skipwhite display
+syn match nuOp "\<not-in\>" nextgroup=nuPrpty skipwhite display
+syn match nuOp "\<not\>" display
+syn match nuOp "\<and\>" nextgroup=nuPrpty skipwhite display
+syn match nuOp "\<or\>" nextgroup=nuPrpty skipwhite display
+syn match nuOp "\<xor\>" nextgroup=nuPrpty skipwhite display
+syn match nuOp "\<bit-or\>" display
+syn match nuOp "\<bit-xor\>" display
+syn match nuOp "\<bit-and\>" display
+syn match nuOp "\<bit-shl\>" display
+syn match nuOp "\<bit-shr\>" display
+syn match nuOp "\<starts-with\>" display
+syn match nuOp "\<ends-with\>" display
+syn match nuOp "\.\.\." display
+
+syn match nuVar "\$[^?\])} \t]\+"
+
+syn match nuIdtfr :\(-\+\)\@![^? \t"=]\+: contained
+
+syn region nuSubCmd start=/"/ skip=/\\./ end=/"/ contained
+
+syn match nuPrpty '\w\+' contained
+
+syn keyword nuType any binary bool cell-path closure datetime directory duration error filesize float glob int list nothing number path range record string table true false null
+
+syn keyword nuCondi if then else
+
+syn match nuUnit "b\>" contained
+syn match nuUnit "kb\>" contained
+syn match nuUnit "mb\>" contained
+syn match nuUnit "gb\>" contained
+syn match nuUnit "tb\>" contained
+syn match nuUnit "pb\>" contained
+syn match nuUnit "eb\>" contained
+syn match nuUnit "kib\>" contained
+syn match nuUnit "mib\>" contained
+syn match nuUnit "gib\>" contained
+syn match nuUnit "tib\>" contained
+syn match nuUnit "pib\>" contained
+syn match nuUnit "eib\>" contained
+
+syn match nuDur "ns\>" contained
+syn match nuDur "us\>" contained
+syn match nuDur "ms\>" contained
+syn match nuDur "sec\>" contained
+syn match nuDur "min\>" contained
+syn match nuDur "hr\>" contained
+syn match nuDur "day\>" contained
+syn match nuDur "wk\>" contained
+
+syn match nuFlag "\<-\k\+"
+
+syn match nuDefflag "\<--env\>" display contained nextgroup=nuIdtfr skipwhite
+syn match nuDefflag "\<--wrapped\>" display contained nextgroup=nuIdtfr skipwhite
+
+syn match nuSysEsc "\^\k\+" display
+
+syn match nuSqrbr "\[" display
+syn match nuSqrbr "\]" display
+syn match nuSqrbr ":" display
+
+syn region nuString start=/\v"/ skip=/\v\\./ end=/\v"/ contains=nuEscaped
+syn region nuString start='\'' end='\''
+syn region nuString start='`' end='`'
+syn region nuString start=/r#\+'/ end=/#\+/ contains=nuString
+
+syn region nuStrInt start=/$'/ end=/'/ contains=nuNested
+syn region nuStrInt start=/$"/ skip=/\\./ end=/"/ contains=nuNested,nuEscaped
+
+syn region nuNested start="("hs=s+1 end=")"he=e-1 contained contains=nuAnsi
+syn match nuAnsi "ansi[a-zA-Z0-9;' -]\+)"me=e-1 contained
+
+syn match nuClosure "|\(\w\|, \)\+|"
+
+syn match nuDot ")\.\(\k\|\.\)\+"ms=s+1 display
+
+syn match nuEscaped "\\\\" display
+syn match nuEscaped :\\": display
+syn match nuEscaped "\\n" display
+syn match nuEscaped "\\t" display
+syn match nuEscaped "\\r" display
+
+hi def link nuCmd	Keyword
+hi def link nuComment	Comment
+hi def link nuTodo	Todo
+hi def link nuString	Constant
+hi def link nuChar	Constant
+hi def link nuOp	Operator
+hi def link nuVar	PreProc
+hi def link nuSqrBr	Special
+hi def link nuIdtfr	Identifier
+hi def link nuType	Type
+hi def link nuUnit	Type
+hi def link nuDur	Type
+hi def link nuPrpty	Special
+hi def link nuSubCmd	Identifier
+hi def link nuStrInt	Constant
+hi def link nuNested	PreProc
+hi def link nuFlag	Special
+hi def link nuEscaped	Special
+hi def link nuCondi	Type
+hi def link nuClosure	Type
+hi def link nuNumber	Number
+hi def link nuDot	Special
+hi def link nuSysEsc	PreProc
+hi def link nuAnsi	Special
+hi def link nuDefflag	Special
+
+let b:current_syntax = "nu"

src/nvim/version.c

@@ -61,7 +61,7 @@ static const int included_patches[] = {
   2423,
   2422,
   2421,
-  // 2420,
+  2420,
   2419,
   // 2418,
   2417,
@@ -147,7 +147,7 @@ static const int included_patches[] = {
   2337,
   2336,
   2335,
-  // 2334,
+  2334,
   2333,
   2332,
   2331,
@@ -174,28 +174,28 @@ static const int included_patches[] = {
   2310,
   2309,
   2308,
-  // 2307,
+  2307,
   2306,
   2305,
   2304,
   2303,
   2302,
   2301,
-  // 2300,
+  2300,
   2299,
   2298,
   2297,
   2296,
-  // 2295,
+  2295,
   2294,
   2293,
   // 2292,
   2291,
   2290,
   2289,
-  // 2288,
+  2288,
-  // 2287,
+  2287,
-  // 2286,
+  2286,
   2285,
   2284,
   2283,
@@ -204,7 +204,7 @@ static const int included_patches[] = {
   2280,
   // 2279,
   2278,
-  // 2277,
+  2277,
   2276,
   2275,
   2274,
@@ -241,7 +241,7 @@ static const int included_patches[] = {
   2243,
   2242,
   // 2241,
-  // 2240,
+  2240,
   2239,
   2238,
   2237,
@@ -268,10 +268,10 @@ static const int included_patches[] = {
   2216,
   2215,
   2214,
-  // 2213,
+  2213,
   2212,
   2211,
-  // 2210,
+  2210,
   2209,
   // 2208,
   2207,
@@ -317,7 +317,7 @@ static const int included_patches[] = {
   2167,
   2166,
   2165,
-  // 2164,
+  2164,
   2163,
   2162,
   2161,
@@ -367,12 +367,12 @@ static const int included_patches[] = {
   2117,
   2116,
   2115,
-  // 2114,
+  2114,
   2113,
   2112,
   2111,
-  // 2110,
+  2110,
-  // 2109,
+  2109,
   2108,
   2107,
   2106,
@@ -449,7 +449,7 @@ static const int included_patches[] = {
   2035,
   2034,
   2033,
-  // 2032,
+  2032,
   2031,
   2030,
   2029,
@@ -472,34 +472,34 @@ static const int included_patches[] = {
   2012,
   2011,
   2010,
-  // 2009,
+  2009,
   2008,
   2007,
   2006,
   2005,
-  // 2004,
+  2004,
   2003,
   2002,
   2001,
   2000,
   // 1999,
-  // 1998,
+  1998,
-  // 1997,
+  1997,
-  // 1996,
+  1996,
   1995,
   1994,
-  // 1993,
+  1993,
   1992,
   1991,
   1990,
   // 1989,
   1988,
-  // 1987,
+  1987,
-  // 1986,
+  1986,
   // 1985,
   1984,
   1983,
-  // 1982,
+  1982,
   // 1981,
   1980,
   // 1979,
@@ -518,16 +518,16 @@ static const int included_patches[] = {
   1966,
   1965,
   // 1964,
-  // 1963,
+  1963,
   1962,
   1961,
   1960,
-  // 1959,
+  1959,
   1958,
   // 1957,
   1956,
   1955,
-  // 1954,
+  1954,
   1953,
   1952,
   1951,
@@ -536,7 +536,7 @@ static const int included_patches[] = {
   1948,
   1947,
   1946,
-  // 1945,
+  1945,
   // 1944,
   // 1943,
   1942,
@@ -545,14 +545,14 @@ static const int included_patches[] = {
   // 1939,
   1938,
   1937,
-  // 1936,
+  1936,
   1935,
-  // 1934,
+  1934,
   1933,
   1932,
   1931,
   1930,
-  // 1929,
+  1929,
   // 1928,
   1927,
   1926,
@@ -562,9 +562,9 @@ static const int included_patches[] = {
   1922,
   1921,
   // 1920,
-  // 1919,
+  1919,
-  // 1918,
+  1918,
-  // 1917,
+  1917,
   1916,
   1915,
   1914,
@@ -574,12 +574,12 @@ static const int included_patches[] = {
   1910,
   1909,
   // 1908,
-  // 1907,
+  1907,
   // 1906,
   // 1905,
   // 1904,
   1903,
-  // 1902,
+  1902,
   1901,
   1900,
   1899,
@@ -607,7 +607,7 @@ static const int included_patches[] = {
   1877,
   1876,
   1875,
-  // 1874,
+  1874,
   1873,
   1872,
   1871,
@@ -631,12 +631,12 @@ static const int included_patches[] = {
   1853,
   1852,
   // 1851,
-  // 1850,
+  1850,
   1849,
   1848,
   1847,
   1846,
-  // 1845,
+  1845,
   1844,
   1843,
   1842,
@@ -667,7 +667,7 @@ static const int included_patches[] = {
   1817,
   1816,
   1815,
-  // 1814,
+  1814,
   // 1813,
   1812,
   // 1811,
@@ -692,28 +692,28 @@ static const int included_patches[] = {
   1792,
   1791,
   1790,
-  // 1789,
+  1789,
   1788,
   // 1787,
-  // 1786,
+  1786,
   1785,
   // 1784,
   1783,
   1782,
   1781,
   1780,
-  // 1779,
+  1779,
-  // 1778,
+  1778,
   1777,
   1776,
   1775,
   1774,
-  // 1773,
+  1773,
   1772,
   1771,
   // 1770,
   1769,
-  // 1768,
+  1768,
   1767,
   1766,
   1765,
@@ -726,10 +726,10 @@ static const int included_patches[] = {
   1758,
   1757,
   1756,
-  // 1755,
+  1755,
-  // 1754,
+  1754,
-  // 1753,
+  1753,
-  // 1752,
+  1752,
   // 1751,
   1750,
   1749,
@@ -748,7 +748,7 @@ static const int included_patches[] = {
   1736,
   1735,
   1734,
-  // 1733,
+  1733,
   1732,
   1731,
   1730,
@@ -762,7 +762,7 @@ static const int included_patches[] = {
   1722,
   1721,
   1720,
-  // 1719,
+  1719,
   // 1718,
   1717,
   1716,
@@ -772,9 +772,9 @@ static const int included_patches[] = {
   1712,
   1711,
   1710,
-  // 1709,
+  1709,
   1708,
-  // 1707,
+  1707,
   1706,
   1705,
   1704,
@@ -803,9 +803,9 @@ static const int included_patches[] = {
   1681,
   1680,
   1679,
-  // 1678,
+  1678,
   1677,
-  // 1676,
+  1676,
   1675,
   1674,
   // 1673,
@@ -815,8 +815,8 @@ static const int included_patches[] = {
   1669,
   1668,
   1667,
-  // 1666,
+  1666,
-  // 1665,
+  1665,
   1664,
   1663,
   1662,
@@ -825,17 +825,17 @@ static const int included_patches[] = {
   // 1659,
   1658,
   1657,
-  // 1656,
+  1656,
   1655,
   1654,
   1653,
   1652,
   1651,
   1650,
-  // 1649,
+  1649,
   1648,
   1647,
-  // 1646,
+  1646,
   1645,
   1644,
   1643,
@@ -845,7 +845,7 @@ static const int included_patches[] = {
   1639,
   1638,
   1637,
-  // 1636,
+  1636,
   1635,
   1634,
   1633,
@@ -859,14 +859,14 @@ static const int included_patches[] = {
   1625,
   1624,
   1623,
-  // 1622,
+  1622,
   1621,
-  // 1620,
+  1620,
   1619,
   1618,
-  // 1617,
+  1617,
   1616,
-  // 1615,
+  1615,
   1614,
   1613,
   // 1612,
@@ -879,13 +879,13 @@ static const int included_patches[] = {
   1605,
   1604,
   1603,
-  // 1602,
+  1602,
   1601,
   // 1600,
   1599,
   1598,
   // 1597,
-  // 1596,
+  1596,
   1595,
   1594,
   1593,
@@ -919,7 +919,7 @@ static const int included_patches[] = {
   1565,
   1564,
   1563,
-  // 1562,
+  1562,
   // 1561,
   // 1560,
   // 1559,
@@ -931,7 +931,7 @@ static const int included_patches[] = {
   // 1553,
   1552,
   1551,
-  // 1550,
+  1550,
   1549,
   // 1548,
   1547,
@@ -954,7 +954,7 @@ static const int included_patches[] = {
   1530,
   1529,
   1528,
-  // 1527,
+  1527,
   1526,
   // 1525,
   1524,
@@ -1398,7 +1398,7 @@ static const int included_patches[] = {
   1086,
   1085,
   1084,
-  // 1083,
+  1083,
   1082,
   1081,
   1080,