patch 9.2.0258: memory leak in add_mark()

Problem:  memory leak in add_mark()
Solution: Free lpos in the error case when it hasn't been added to the
          dict yet (Huihui Huang)

closes: #19827

Signed-off-by: Huihui Huang <625173@qq.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

.github/MAINTAINERS

@@ -80,6 +80,7 @@ runtime/compiler/jjs.vim				@dkearns
 runtime/compiler/jq.vim					@vito-c
 runtime/compiler/jshint.vim				@dkearns
 runtime/compiler/jsonlint.vim				@dkearns
+runtime/compiler/just.vim				@Alarcritty
 runtime/compiler/make.vim				@Konfekt
 runtime/compiler/mypy.vim				@Konfekt
 runtime/compiler/pandoc.vim				@Konfekt
@@ -349,6 +350,7 @@ runtime/ftplugin/vdf.vim				@ObserverOfTime
 runtime/ftplugin/vim.vim				@dkearns
 runtime/ftplugin/wget.vim				@dkearns
 runtime/ftplugin/wget2.vim				@dkearns
+runtime/ftplugin/wks.vim				@anakin4747
 runtime/ftplugin/xcompose.vim				@ObserverOfTime
 runtime/ftplugin/xml.vim				@chrisbra
 runtime/ftplugin/xs.vim					@petdance
@@ -470,6 +472,7 @@ runtime/syntax/shared/hgcommitDiff.vim			@vegerot
 runtime/syntax/abaqus.vim				@costerwi
 runtime/syntax/abnf.vim					@A4-Tacks
 runtime/syntax/aidl.vim					@dpelle
+runtime/syntax/amiga.vim				@sodero
 runtime/syntax/ant.vim					@dkearns
 runtime/syntax/antlr4.vim				@jiangyinzuo
 runtime/syntax/arduino.vim				@johshoff
@@ -709,6 +712,7 @@ runtime/syntax/vroom.vim				@dbarnett
 runtime/syntax/wdl.vim					@zenmatic
 runtime/syntax/wget.vim					@dkearns
 runtime/syntax/wget2.vim				@dkearns
+runtime/syntax/wks.vim					@anakin4747
 runtime/syntax/xbl.vim					@dkearns
 runtime/syntax/xcompose.vim				@ObserverOfTime
 runtime/syntax/xml.vim					@chrisbra

.github/actions/test_artifacts/action.yml

@@ -27,7 +27,7 @@ runs:
         # set as the "result".
         result-encoding: string
     - name: Upload failed tests
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         # Name of the artifact to upload.
         name: ${{ format('GH-{0}-{1}-{2}-{3}-{4}-failed-tests',

.github/dependabot.yml

@@ -1,8 +1,16 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
+      - "/.github/actions/**/*"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "CI"
+    cooldown:
+      default-days: 7
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
             architecture: arm64
           - features: normal
             compiler: gcc
-            extra: [vimtags, proto, preproc_indent, encoding]
+            extra: [vimtags, proto, preproc_indent, encoding, codestyle]
           - features: huge
             compiler: gcc
             extra: [no_x11_wl]
@@ -335,7 +335,7 @@ jobs:
           fi
 
       - name: Test
-        timeout-minutes: 30
+        timeout-minutes: 45
         run: |
           make ${SHADOWOPT} ${TEST}
 
@@ -370,6 +370,11 @@ jobs:
             true
           )
 
+      - name: Check Source Code style
+        if: contains(matrix.extra, 'codestyle')
+        run: |
+          make -C src/testdir codestyle
+
       - name: Check preprocessor indent
         if: contains(matrix.extra, 'preproc_indent')
         run: |
@@ -776,7 +781,7 @@ jobs:
       #    copy src\vim*.dll artifacts
       #
       #- name: Upload Artifact
-      #  uses: actions/upload-artifact@v1
+      #  uses: actions/upload-artifact@v7
       #  with:
       #    name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
       #    path: ./artifacts

runtime/autoload/dist/ft.vim

@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:		The Vim Project <https://github.com/vim/vim>
-# Last Change:		2026 Mar 13
+# Last Change:		2026 Mar 24
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -11,6 +11,12 @@ vim9script
 
 var prolog_pattern = '^\s*\(:-\|%\+\(\s\|$\)\|\/\*\)\|\.\s*$'
 
+def IsObjectScriptRoutine(): bool
+  var line1 = getline(1)
+  line1 = substitute(line1, '^\ufeff', '', '')
+  return line1 =~? '^\s*routine\>\s\+[%A-Za-z][%A-Za-z0-9_.]*\%(\s*\[\|\s*;\|$\)'
+enddef
+
 export def Check_inp()
   if getline(1) =~ '%%'
     setf tex
@@ -75,6 +81,18 @@ export def FTasm()
   exe "setf " .. fnameescape(b:asmsyntax)
 enddef
 
+export def FTmac()
+  if exists("g:filetype_mac")
+    exe "setf " .. g:filetype_mac
+  else
+    if IsObjectScriptRoutine()
+      setf objectscript_routine
+    else
+      FTasm()
+    endif
+  endif
+enddef
+
 export def FTasmsyntax()
   # see if the file contains any asmsyntax=foo overrides. If so, change
   # b:asmsyntax appropriately
@@ -871,6 +889,10 @@ export def FTinc()
   if exists("g:filetype_inc")
     exe "setf " .. g:filetype_inc
   else
+    if IsObjectScriptRoutine()
+      setf objectscript_routine
+      return
+    endif
     for lnum in range(1, min([line("$"), 20]))
       var line = getline(lnum)
       if line =~? "perlscript"
@@ -940,6 +962,16 @@ export def FTi()
   setf progress
 enddef
 
+export def FTint()
+  if exists("g:filetype_int")
+    exe "setf " .. g:filetype_int
+  elseif IsObjectScriptRoutine()
+    setf objectscript_routine
+  else
+    setf hex
+  endif
+enddef
+
 var ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
 var ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
 
@@ -1789,6 +1821,8 @@ const ft_from_ext = {
   "cairo": "cairo",
   # Cap'n Proto
   "capnp": "capnp",
+  # Common Package Specification
+  "cps": "json",
   # C#
   "cs": "cs",
   "csx": "cs",
@@ -1886,6 +1920,8 @@ const ft_from_ext = {
   "cr": "crystal",
   # CSV Files
   "csv": "csv",
+  # Concertor
+  "cto": "concerto",
   # CUDA Compute Unified Device Architecture
   "cu": "cuda",
   "cuh": "cuda",

runtime/compiler/just.vim

@@ -0,0 +1,23 @@
+" Vim compiler file
+" Compiler:	Just
+" Maintainer:	Alarcritty
+" Last Change:	2026 Mar 20
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "just"
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=just
+
+CompilerSet errorformat=
+      \%Eerror:\ %m,
+      \%C%\\s%#——▶\ %f:%l:%c,
+      \%-C%.%#,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/doc/Makefile

@@ -35,19 +35,19 @@ doctags: doctags.c
 	$(CC) doctags.c -o doctags
 
 vim.man: vim.1
-	nroff -man $? | sed -e s/.//g > $@
+	nroff -c -man $? | sed -e s/.//g > $@
 
 evim.man: evim.1
-	nroff -man $? | sed -e s/.//g > $@
+	nroff -c -man $? | sed -e s/.//g > $@
 
 vimdiff.man: vimdiff.1
-	nroff -man $? | sed -e s/.//g > $@
+	nroff -c -man $? | sed -e s/.//g > $@
 
 vimtutor.man: vimtutor.1
-	nroff -man $? | sed -e s/.//g > $@
+	nroff -c -man $? | sed -e s/.//g > $@
 
 xxd.man: xxd.1
-	nroff -man $? | sed -e s/.//g > $@
+	nroff -c -man $? | sed -e s/.//g > $@
 
 # Awk version of .txt to .html conversion.
 html: noerrors tags $(HTMLS)

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.2.  Last change: 2026 Mar 17
+*builtin.txt*	For Vim version 9.2.  Last change: 2026 Mar 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -699,7 +699,8 @@ synconcealed({lnum}, {col})	List	info about concealing
 synstack({lnum}, {col})		List	stack of syntax IDs at {lnum} and
 					{col}
 system({expr} [, {input}])	String	output of shell command/filter {expr}
-systemlist({expr} [, {input}])	List	output of shell command/filter {expr}
+systemlist({expr} [, {input}])
+				List	output of shell command/filter {expr}
 tabpagebuflist([{arg}])		List	list of buffer numbers in tab page
 tabpagenr([{arg}])		Number	number of current or last tab page
 tabpagewinnr({tabarg} [, {arg}])
@@ -6432,6 +6433,8 @@ js_decode({string})					*js_decode()*
 		- Strings can be in single quotes.
 		- Empty items in an array (between two commas) are allowed and
 		  result in v:none items.
+		- Capitalization is ignored in keywords: true, false, null,
+		  NaN, Infinity and -Infinity.
 
 		Can also be used as a |method|: >
 			ReadObject()->js_decode()
@@ -6470,12 +6473,9 @@ json_decode({string})					*json_decode()* *E491*
 		  same as {"1":2}.
 		- More floating point numbers are recognized, e.g. "1." for
 		  "1.0", or "001.2" for "1.2".  Special floating point values
-		  "Infinity", "-Infinity" and "NaN" (capitalization ignored)
-		  are accepted.
+		  "Infinity", "-Infinity" and "NaN" are accepted.
 		- Leading zeroes in integer numbers are ignored, e.g. "012"
 		  for "12" or "-012" for "-12".
-		- Capitalization is ignored in literal names null, true or
-		  false, e.g. "NULL" for "null", "True" for "true".
 		- Control characters U+0000 through U+001F which are not
 		  escaped in strings are accepted, e.g. "	" (tab
 		  character in string) for "\t".
@@ -6483,10 +6483,10 @@ json_decode({string})					*json_decode()* *E491*
 		  and results in v:none.
 		- Backslash in an invalid 2-character sequence escape is
 		  ignored, e.g. "\a" is decoded as "a".
-		- A correct surrogate pair in JSON strings should normally be
-		  a 12 character sequence such as "\uD834\uDD1E", but
-		  json_decode() silently accepts truncated surrogate pairs
-		  such as "\uD834" or "\uD834\u"
+		- A surrogate pair in JSON strings is a 12 character sequence
+		  such as "\uD834\uDD1E".  A lone surrogate or an invalid
+		  surrogate pair (e.g. "\uD800" or "\uD800\uD800") results
+		  in an error.
 							*E938*
 		A duplicate key in an object, valid in rfc7159, is not
 		accepted by json_decode() as the result must be a valid Vim
@@ -11695,6 +11695,30 @@ system({expr} [, {input}])				*system()* *E677*
 		Get the output of the shell command {expr} as a |String|.  See
 		|systemlist()| to get the output as a |List|.
 
+		{expr} can be a |String| or a |List|.
+		When {expr} is a |String|, the command is executed through the
+		shell (see below for how the command is constructed).
+
+								*E1575*
+		When {expr} is a |List|, the first item is the executable and
+		the remaining items are passed as arguments directly.  The
+		command is executed without using a shell, similar to
+		|job_start()|.  Since no shell is involved, shell features
+		such as redirection, piping, globbing, environment variable
+		expansion and backtick expansion will not work.  Characters
+		like ">" are passed as literal arguments to the command, not
+		interpreted as redirection.  Use this form when arguments may
+		contain special characters that should not be interpreted by
+		the shell.  Example: >
+		    :let out = system(['grep', '-r', 'pattern', '.'])
+<		With the String form ">" would be shell redirection, but
+		with a List it is passed as a literal argument: >
+		    :let out = system(['echo', 'hello', '>', 'world'])
+<		This outputs "hello > world", not redirect to a file.
+
+		To use the shell explicitly with a List: >
+		    :let out = system(['/bin/sh', '-c', 'echo $HOME'])
+<
 		When {input} is given and is a |String| this string is written
 		to a file and passed as stdin to the command.  The string is
 		written as-is, you need to take care of using the correct line
@@ -11720,11 +11744,11 @@ system({expr} [, {input}])				*system()* *E677*
 		being echoed on the screen. >
 			:silent let f = system('ls *.vim')
 <
-		Note: Use |shellescape()| or |::S| with |expand()| or
-		|fnamemodify()| to escape special characters in a command
-		argument.  Newlines in {expr} may cause the command to fail.
-		The characters in 'shellquote' and 'shellxquote' may also
-		cause trouble.
+		Note: When {expr} is a String, use |shellescape()| or |::S|
+		with |expand()| or |fnamemodify()| to escape special
+		characters in a command argument.  Newlines in {expr} may
+		cause the command to fail.  The characters in 'shellquote'
+		and 'shellxquote' may also cause trouble.
 		This is not to be used for interactive commands.
 
 		The result is a String.  Example: >
@@ -11737,7 +11761,8 @@ system({expr} [, {input}])				*system()* *E677*
 		To avoid the string being truncated at a NUL, all NUL
 		characters are replaced with SOH (0x01).
 
-		The command executed is constructed using several options:
+		When {expr} is a String, the command executed is constructed
+		using several options:
 	'shell' 'shellcmdflag' 'shellxquote' {expr} 'shellredir' {tmp} 'shellxquote'
 		({tmp} is an automatically generated file name).
 		For Unix, braces are put around {expr} to allow for
@@ -11764,6 +11789,9 @@ system({expr} [, {input}])				*system()* *E677*
 systemlist({expr} [, {input}])				*systemlist()*
 		Same as |system()|, but returns a |List| with lines (parts of
 		output separated by NL) with NULs transformed into NLs.
+		Like |system()|, {expr} can be a |String| (executed through
+		the shell) or a |List| (executed directly without a shell).
+		See |system()| for details.
 		Output is the same as |readfile()| will output with {binary}
 		argument set to "b", except that there is no extra empty item
 		when the result ends in a NL.

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*filetype.txt*	For Vim version 9.2.  Last change: 2026 Mar 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -161,8 +161,10 @@ variables can be used to overrule the filetype used for certain extensions:
 						|ft-cpp-syntax|
 	*.i		g:filetype_i		|ft-progress-syntax|
 	*.inc		g:filetype_inc
+	*.int		g:filetype_int
 	*.lsl		g:filetype_lsl
 	*.m		g:filetype_m		|ft-mathematica-syntax|
+	*.mac		g:filetype_mac
 	*[mM]makefile,*.mk,*.mak,[mM]akefile*
 			g:make_flavor		|ft-make-syntax|
 	*.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*if_pyth.txt*	For Vim version 9.2.  Last change: 2026 Mar 18
 
 
 		  VIM REFERENCE MANUAL	  by Paul Moore
@@ -186,7 +186,7 @@ vim.eval(str)						*python-eval*
 	- a list if the Vim expression evaluates to a Vim |list|
 	- a tuple if the Vim expression evaluates to a Vim |tuple|
 	- a dictionary if the Vim expression evaluates to a Vim |dict|
-	- a boolean if Vim exression evaluates to |v:true| or |v:false|
+	- a boolean if Vim expression evaluates to |v:true| or |v:false|
 	- `None` if Vim expression evaluates to |v:null| or |v:none|
 	Dictionaries, lists and tuples are recursively expanded.
 	Examples: >

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.2.  Last change: 2026 Mar 16
+*options.txt*	For Vim version 9.2.  Last change: 2026 Mar 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -97,6 +97,17 @@ achieve special effects.  These options come in three forms:
 			If the option is a list of flags, superfluous flags
 			are removed.  When adding a flag that was already
 			present the option value doesn't change.
+			When the option supports "key:value" items and {value}
+			contains a "key:value" item or multiple
+			comma-separated items, each item is processed
+			individually:
+			- A "key:value" item where the key already exists with
+			  a different value: the old item is removed and the
+			  new item is appended to the end.
+			- A "key:value" item that is an exact duplicate is
+			  left unchanged.
+			- Other items that already exist are left unchanged.
+			- New items are appended to the end.
 			Also see |:set-args| above.
 
 :se[t] {option}^={value}				*:set^=*
@@ -104,6 +115,11 @@ achieve special effects.  These options come in three forms:
 			the {value} to a string option.  When the option is a
 			comma-separated list, a comma is added, unless the
 			value was empty.
+			When the option supports "key:value" items and {value}
+			contains a "key:value" item or multiple
+			comma-separated items, each item is processed
+			individually.  Works like |:set+=| but new items are
+			prepended to the beginning instead of appended.
 			Also see |:set-args| above.
 
 :se[t] {option}-={value}				*:set-=*
@@ -116,6 +132,12 @@ achieve special effects.  These options come in three forms:
 			When the option is a list of flags, {value} must be
 			exactly as they appear in the option.  Remove flags
 			one by one to avoid problems.
+			When the option supports "key:value" items and {value}
+			contains a "key:value" item or multiple
+			comma-separated items, each item is processed
+			individually.  A "key:value" item removes the existing
+			item with that key regardless of its value.  A "key:"
+			item also removes by key match.
 			The individual values from a comma separated list or
 			list of flags can be inserted by typing 'wildchar'.
 			See |complete-set-option|.
@@ -6004,7 +6026,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Increasing this limit above 200 also changes the maximum for Ex
 	command recursion, see |E169|.
 	See also |:function|.
-	Also used for maximum depth of callback functions.
+	Also used for maximum depth of callback functions and encoding and
+	decoding of deeply nested json data.
 
 						*'maxmapdepth'* *'mmd'* *E223*
 'maxmapdepth' 'mmd'	number	(default 1000)

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*syntax.txt*	For Vim version 9.2.  Last change: 2026 Mar 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2285,11 +2285,11 @@ cycles for such a feature to become either integrated into the platform or
 withdrawn from this effort.  To cater for early adopters, there is optional
 support in Vim for syntax related preview features that are implemented.  You
 can request it by specifying a list of preview feature numbers as follows: >
-	:let g:java_syntax_previews = [507]
+	:let g:java_syntax_previews = [530]
 
 The supported JEP numbers are to be drawn from this table:
 	`430`: String Templates [JDK 21]
-	`507`: Primitive types in Patterns, instanceof, and switch
+	`530`: Primitive types in Patterns, instanceof, and switch
 
 Note that as soon as the particular preview feature will have been integrated
 into the Java platform, its entry will be removed from the table and related

runtime/doc/tags

@@ -4573,7 +4573,6 @@ E1335	vim9class.txt	/*E1335*
 E1336	options.txt	/*E1336*
 E1337	vim9class.txt	/*E1337*
 E1338	vim9class.txt	/*E1338*
-E1339	textprop.txt	/*E1339*
 E134	change.txt	/*E134*
 E1340	vim9class.txt	/*E1340*
 E1341	vim9class.txt	/*E1341*
@@ -4772,6 +4771,7 @@ E1571	builtin.txt	/*E1571*
 E1572	options.txt	/*E1572*
 E1573	channel.txt	/*E1573*
 E1574	channel.txt	/*E1574*
+E1575	builtin.txt	/*E1575*
 E158	sign.txt	/*E158*
 E159	sign.txt	/*E159*
 E16	cmdline.txt	/*E16*

runtime/doc/textprop.txt

@@ -141,9 +141,9 @@ prop_add({lnum}, {col}, {props})
 				the current buffer is used
 		   id		user defined ID for the property; must be a
 				number, should be positive |E1510|;
-				when using "text" then "id" must not be
-				present and will be set automatically to a
-				negative number; otherwise zero is used
+				when using "text" then any "id" value is
+				ignored and a negative number is assigned
+				automatically; otherwise zero is used
 							*E1305*
 		   text		text to be displayed before {col}, or
 				above/below the line if {col} is zero; prepend
@@ -224,14 +224,9 @@ prop_add({lnum}, {col}, {props})
 		is difficult to compute).
 		A negative "id" will be chosen and is returned.
 
-		Before text properties with text were supported it was
-		possible to use a negative "id", even though this was very
-		rare.  Now that negative "id"s are reserved for text
-		properties with text an error is given when using a negative
-		"id".  When a text property with text already exists using a
-		negative "id" results in *E1293* .  If a negative "id" was
-		used and later a text property with text is added results in
-		*E1339* .
+		Negative "id"s are reserved for text properties with "text"
+		and cannot be used otherwise.  Using a negative "id" results
+		in *E1293* .
 
 		Can also be used as a |method|: >
 			GetLnum()->prop_add(col, props)

runtime/doc/version9.txt

@@ -1,4 +1,4 @@
-*version9.txt*	For Vim version 9.2.  Last change: 2026 Mar 17
+*version9.txt*	For Vim version 9.2.  Last change: 2026 Mar 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -52595,11 +52595,13 @@ between them is small (5 bytes or less) and contains only non-word characters.
 This prevents fragmented highlighting when only whitespace or punctuation
 separates changes.
 
-Restricted mode~
+Restricted mode ~
 ---------------
 Using external diff mode or setting environment variables is no longer allowed
 when Vim is running in |restricted-mode|.
 
+Using |:cscope| is no longer allowed.
+
 Other ~
 -----
 - The new |xdg.vim| script for full XDG compatibility is included.
@@ -52607,11 +52609,22 @@ Other ~
 - Support for "dap" channel mode for the |debug-adapter-protocol|.
 - |status-line| can use several lines, see 'statuslineopt'.
 - New "leadtab" value for the 'listchars' setting.
+- Improved |:set+=|, |:set^=| and |:set-=| handling of comma-separated "key:value"
+  pairs individually (e.g. 'listchars', 'fillchars', 'diffopt').
+- |system()| and |systemlist()| functions accept a list as first argument,
+  bypassing the shell completely.
+
+xxd ~
+---
+Add "-t" option to append a terminating NUL byte to C include output (-i).
 
 							*changed-9.3*
 Changed~
 -------
 - Support for NeXTStep was dropped with patch v9.2.0122
+- |json_decode()| is stricter: keywords must be lowercase, lone surrogates are
+  now invalid
+- |js_decode()| rejects lone surrogates
 
 							*added-9.3*
 Added ~

runtime/doc/xxd-it.1

@@ -1,9 +1,9 @@
-.TH XXD 1 "Maggio 2024" "Pagina di manuale per xxd"
+.TH XXD 1 "Mar 2026" "Pagina di manuale per xxd"
 .\"
-.\" 21 Maggio 1996
-.\" Autore della pagina di manuale:
+.\" 21st May 1996
+.\" Man page author:
 .\"    Tony Nugent <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.\"    Modificato da Bram Moolenaar <Bram@vim.org>
+.\"    Changes by Bram Moolenaar <Bram@vim.org>
 .SH NOME
 .I xxd
 \- Produce lista esadecimale da un file binario o viceversa.
@@ -170,11 +170,14 @@ byte assoluti (o relativi) di distanza all'interno di input_file.
 (o se in combinazione con \fI+ \fR: prima della posizione corrente nel file `standard input').
 Se non si specifica l'opzione \-s, xxd inizia dalla posizione corrente all'interno del file.
 .TP
+.I \-t
+Quando l'output è nello stile delle `include' di C (opzione \-i ) aggiungere uno zero binario a fine stringa.
+.TP
 .I \-u
-Usa lettere esadecimali maiuscole. Per default si usano lettere minuscole.
+Usare lettere esadecimali maiuscole. Per default si usano lettere minuscole.
 .TP
 .IR \-v " | " \-version
-Visualizza la stringa contenente la versione del programma.
+Visualizzare la stringa contenente la versione del programma.
 .SH ATTENZIONE
 .PP
 .I xxd \-r
@@ -182,7 +185,8 @@ Visualizza la stringa contenente la versione del programma.
 Se è possibili posizionarsi tramite `seek' sul file di output, il numero di riga
 di ogni riga esadecimale può essere non ordinato, delle righe possono mancare, o
 sovrapporsi. In tal caso xxd userà lseek(2) per posizionarsi all'interno del file.
-Se per il file di output non si può usare `seek', sono permessi solo dei "buchi", che saranno riempiti con zeri binari.
+Se per il file di output non si può usare `seek', sono permessi solo dei "buchi",
+che saranno riempiti con zeri binari.
 .PP
 .I xxd \-r
 non genera mai errori per parametri errati. I parametri extra sono silenziosamente ignorati.
@@ -246,25 +250,25 @@ Stampa 3 righe (0x30 byte in esadecimale) alla fine di
 \fI% xxd \-s \-0x30 file\fR
 .PP
 Nota: I risultati degli esempi seguenti sono riferiti alla versione di
-Maggio 2024 della pagina di manuale [quella che state leggendo].
+Marzo 2026 della pagina di manuale [quella che state leggendo].
 .PP
 .br
 Stampa 120 byte come immagine esadecimale continua con 20 byte per riga.
 .br
 \fI% xxd \-l 120 \-ps \-c 20 xxd-it.UTF-8.1\fR
 .br
-2e544820585844203120224d616767696f203230
+2e544820585844203120224d6172203230323622
 .br
-3234222022506167696e61206469206d616e7561
+2022506167696e61206469206d616e75616c6520
 .br
-6c652070657220787864220a2e5c220a2e5c2220
+70657220787864220a2e5c220a2e5c2220323173
 .br
-3231204d616767696f20313939360a2e5c222041
+74204d617920313939360a2e5c22204d616e2070
 .br
-75746f72652064656c6c6120706167696e612064
+61676520617574686f723a0a2e5c222020202054
+.br
+6f6e79204e7567656e74203c746f6e7940736374
 .br
-69206d616e75616c653a0a2e5c2220202020546f
-.PP
 
 .br
 Stampa i primi 120 byte di questa pagina di manuale a 12 byte per riga.
@@ -273,30 +277,30 @@ Stampa i primi 120 byte di questa pagina di manuale a 12 byte per riga.
 .br
 00000000: 2e54 4820 5858 4420 3120 224d  .TH XXD 1 "M
 .br
-0000000c: 6167 6769 6f20 3230 3234 2220  aggio 2024" 
+0000000c: 6172 2032 3032 3622 2022 5061  ar 2026" "Pa
 .br
-00000018: 2250 6167 696e 6120 6469 206d  "Pagina di m
+00000018: 6769 6e61 2064 6920 6d61 6e75  gina di manu
 .br
-00000024: 616e 7561 6c65 2070 6572 2078  anuale per x
+00000024: 616c 6520 7065 7220 7878 6422  ale per xxd"
 .br
-00000030: 7864 220a 2e5c 220a 2e5c 2220  xd"..\"..\" 
+00000030: 0a2e 5c22 0a2e 5c22 2032 3173  ..\\"..\\" 21s
 .br
-0000003c: 3231 204d 6167 6769 6f20 3139  21 Maggio 19
+0000003c: 7420 4d61 7920 3139 3936 0a2e  t May 1996..
 .br
-00000048: 3936 0a2e 5c22 2041 7574 6f72  96..\" Autor
+00000048: 5c22 204d 616e 2070 6167 6520  \\" Man page 
 .br
-00000054: 6520 6465 6c6c 6120 7061 6769  e della pagi
+00000054: 6175 7468 6f72 3a0a 2e5c 2220  author:..\\" 
 .br
-00000060: 6e61 2064 6920 6d61 6e75 616c  na di manual
+00000060: 2020 2054 6f6e 7920 4e75 6765     Tony Nuge
 .br
-0000006c: 653a 0a2e 5c22 2020 2020 546f  e:..\"    To
+0000006c: 6e74 203c 746f 6e79 4073 6374  nt <tony@sct
 .PP
 .br
-Visualizza la data dal file xxd-it.UTF-8.1
+Visualizza la data della prima versione di questa pagina dal file xxd-it.UTF-8.1
 .br
-\fI% xxd \-s 0x3c \-l 14 \-c 14 xxd-it.UTF-8.1\fR
+\fI% xxd \-s 0x39 \-l 13 \-c 13 xxd-it.UTF-8.1\fR
 .br
-0000003c: 3231 204d 6167 6769 6f20 3139 3936  21 Maggio 1996
+00000039: 3231 7374 204d 6179 2031 3939 36  21st May 1996
 .PP
 .br
 Copia
@@ -311,11 +315,11 @@ premettendogli 100 byte a 0x00.
 .br
 Modifica (patch) la data nel file xxd-it.UTF-8.1
 .br
-\fI% echo "000003c: 3331" | xxd \-r \- xxd-it.UTF-8.1\fR
+\fI% echo "0000039: 3331" | xxd \-r \- xxd-it.UTF-8.1\fR
 .br
-\fI% xxd \-s 0x3c \-l 14 \-c 14 xxd-it.UTF-8.1\fR
+\fI% xxd \-s 0x39 \-l 13 \-c 13 xxd-it.UTF-8.1\fR
 .br
-0000003c: 3331 204d 6167 6769 6f20 3139 3936  31 Maggio 1996
+00000039: 3331 7374 204d 6179 2031 3939 36  31st May 1996
 .PP
 .br
 Crea un file di 65537 byte tutto a 0x00,
@@ -366,6 +370,20 @@ Leggere singoli caratteri da una linea seriale
 .br
 \fI% echo \-n foo > /dev/term/b\fR
 .PP
+Output nello stile delle `include' di C (opzione \-i ) con uno zero binario a fine stringa
+.br
+\fI% echo -n \&"0123456789\&" > cifre\fR
+.br
+\fI% xxd -i -t cifre\fR
+.br
+unsigned char cifre[] = {
+.br
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x00
+.br
+};
+.br
+unsigned int cifre_len = 10;
+.PP
 .SH CODICI DI RITORNO
 Il programma può restituire questi codici di errore:
 .TP

runtime/doc/xxd-it.UTF-8.1

@@ -1,9 +1,9 @@
-.TH XXD 1 "Maggio 2024" "Pagina di manuale per xxd"
+.TH XXD 1 "Mar 2026" "Pagina di manuale per xxd"
 .\"
-.\" 21 Maggio 1996
-.\" Autore della pagina di manuale:
+.\" 21st May 1996
+.\" Man page author:
 .\"    Tony Nugent <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.\"    Modificato da Bram Moolenaar <Bram@vim.org>
+.\"    Changes by Bram Moolenaar <Bram@vim.org>
 .SH NOME
 .I xxd
 \- Produce lista esadecimale da un file binario o viceversa.
@@ -170,11 +170,14 @@ byte assoluti (o relativi) di distanza all'interno di input_file.
 (o se in combinazione con \fI+ \fR: prima della posizione corrente nel file `standard input').
 Se non si specifica l'opzione \-s, xxd inizia dalla posizione corrente all'interno del file.
 .TP
+.I \-t
+Quando l'output è nello stile delle `include' di C (opzione \-i ) aggiungere uno zero binario a fine stringa.
+.TP
 .I \-u
-Usa lettere esadecimali maiuscole. Per default si usano lettere minuscole.
+Usare lettere esadecimali maiuscole. Per default si usano lettere minuscole.
 .TP
 .IR \-v " | " \-version
-Visualizza la stringa contenente la versione del programma.
+Visualizzare la stringa contenente la versione del programma.
 .SH ATTENZIONE
 .PP
 .I xxd \-r
@@ -182,7 +185,8 @@ Visualizza la stringa contenente la versione del programma.
 Se è possibili posizionarsi tramite `seek' sul file di output, il numero di riga
 di ogni riga esadecimale può essere non ordinato, delle righe possono mancare, o
 sovrapporsi. In tal caso xxd userà lseek(2) per posizionarsi all'interno del file.
-Se per il file di output non si può usare `seek', sono permessi solo dei "buchi", che saranno riempiti con zeri binari.
+Se per il file di output non si può usare `seek', sono permessi solo dei "buchi",
+che saranno riempiti con zeri binari.
 .PP
 .I xxd \-r
 non genera mai errori per parametri errati. I parametri extra sono silenziosamente ignorati.
@@ -246,25 +250,25 @@ Stampa 3 righe (0x30 byte in esadecimale) alla fine di
 \fI% xxd \-s \-0x30 file\fR
 .PP
 Nota: I risultati degli esempi seguenti sono riferiti alla versione di
-Maggio 2024 della pagina di manuale [quella che state leggendo].
+Marzo 2026 della pagina di manuale [quella che state leggendo].
 .PP
 .br
 Stampa 120 byte come immagine esadecimale continua con 20 byte per riga.
 .br
 \fI% xxd \-l 120 \-ps \-c 20 xxd-it.UTF-8.1\fR
 .br
-2e544820585844203120224d616767696f203230
+2e544820585844203120224d6172203230323622
 .br
-3234222022506167696e61206469206d616e7561
+2022506167696e61206469206d616e75616c6520
 .br
-6c652070657220787864220a2e5c220a2e5c2220
+70657220787864220a2e5c220a2e5c2220323173
 .br
-3231204d616767696f20313939360a2e5c222041
+74204d617920313939360a2e5c22204d616e2070
 .br
-75746f72652064656c6c6120706167696e612064
+61676520617574686f723a0a2e5c222020202054
+.br
+6f6e79204e7567656e74203c746f6e7940736374
 .br
-69206d616e75616c653a0a2e5c2220202020546f
-.PP
 
 .br
 Stampa i primi 120 byte di questa pagina di manuale a 12 byte per riga.
@@ -273,30 +277,30 @@ Stampa i primi 120 byte di questa pagina di manuale a 12 byte per riga.
 .br
 00000000: 2e54 4820 5858 4420 3120 224d  .TH XXD 1 "M
 .br
-0000000c: 6167 6769 6f20 3230 3234 2220  aggio 2024" 
+0000000c: 6172 2032 3032 3622 2022 5061  ar 2026" "Pa
 .br
-00000018: 2250 6167 696e 6120 6469 206d  "Pagina di m
+00000018: 6769 6e61 2064 6920 6d61 6e75  gina di manu
 .br
-00000024: 616e 7561 6c65 2070 6572 2078  anuale per x
+00000024: 616c 6520 7065 7220 7878 6422  ale per xxd"
 .br
-00000030: 7864 220a 2e5c 220a 2e5c 2220  xd"..\"..\" 
+00000030: 0a2e 5c22 0a2e 5c22 2032 3173  ..\\"..\\" 21s
 .br
-0000003c: 3231 204d 6167 6769 6f20 3139  21 Maggio 19
+0000003c: 7420 4d61 7920 3139 3936 0a2e  t May 1996..
 .br
-00000048: 3936 0a2e 5c22 2041 7574 6f72  96..\" Autor
+00000048: 5c22 204d 616e 2070 6167 6520  \\" Man page 
 .br
-00000054: 6520 6465 6c6c 6120 7061 6769  e della pagi
+00000054: 6175 7468 6f72 3a0a 2e5c 2220  author:..\\" 
 .br
-00000060: 6e61 2064 6920 6d61 6e75 616c  na di manual
+00000060: 2020 2054 6f6e 7920 4e75 6765     Tony Nuge
 .br
-0000006c: 653a 0a2e 5c22 2020 2020 546f  e:..\"    To
+0000006c: 6e74 203c 746f 6e79 4073 6374  nt <tony@sct
 .PP
 .br
-Visualizza la data dal file xxd-it.UTF-8.1
+Visualizza la data della prima versione di questa pagina dal file xxd-it.UTF-8.1
 .br
-\fI% xxd \-s 0x3c \-l 14 \-c 14 xxd-it.UTF-8.1\fR
+\fI% xxd \-s 0x39 \-l 13 \-c 13 xxd-it.UTF-8.1\fR
 .br
-0000003c: 3231 204d 6167 6769 6f20 3139 3936  21 Maggio 1996
+00000039: 3231 7374 204d 6179 2031 3939 36  21st May 1996
 .PP
 .br
 Copia
@@ -311,11 +315,11 @@ premettendogli 100 byte a 0x00.
 .br
 Modifica (patch) la data nel file xxd-it.UTF-8.1
 .br
-\fI% echo "000003c: 3331" | xxd \-r \- xxd-it.UTF-8.1\fR
+\fI% echo "0000039: 3331" | xxd \-r \- xxd-it.UTF-8.1\fR
 .br
-\fI% xxd \-s 0x3c \-l 14 \-c 14 xxd-it.UTF-8.1\fR
+\fI% xxd \-s 0x39 \-l 13 \-c 13 xxd-it.UTF-8.1\fR
 .br
-0000003c: 3331 204d 6167 6769 6f20 3139 3936  31 Maggio 1996
+00000039: 3331 7374 204d 6179 2031 3939 36  31st May 1996
 .PP
 .br
 Crea un file di 65537 byte tutto a 0x00,
@@ -366,6 +370,20 @@ Leggere singoli caratteri da una linea seriale
 .br
 \fI% echo \-n foo > /dev/term/b\fR
 .PP
+Output nello stile delle `include' di C (opzione \-i ) con uno zero binario a fine stringa
+.br
+\fI% echo -n \&"0123456789\&" > cifre\fR
+.br
+\fI% xxd -i -t cifre\fR
+.br
+unsigned char cifre[] = {
+.br
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x00
+.br
+};
+.br
+unsigned int cifre_len = 10;
+.PP
 .SH CODICI DI RITORNO
 Il programma può restituire questi codici di errore:
 .TP

runtime/doc/xxd.1

@@ -1,4 +1,4 @@
-.TH XXD 1 "May 2024" "Manual page for xxd"
+.TH XXD 1 "Mar 2026" "Manual page for xxd"
 .\"
 .\" 21st May 1996
 .\" Man page author:
@@ -169,6 +169,9 @@ should be that many characters from the end of the input (or if combined with
 \fI+\fR: before the current stdin file position).
 Without \-s option, xxd starts at the current file position.
 .TP
+.I \-t
+When outputting in C include file style using \-i include the terminating zero.
+.TP
 .I \-u
 Use upper-case hex letters. Default is lower-case.
 .TP
@@ -243,14 +246,14 @@ Print 3 lines (hex 0x30 bytes) from the end of
 \fI% xxd \-s \-0x30 file\fR
 .PP
 Note: The results of the examples below are relevant to the xxd.1 man page as of
-May 2024
+March 2026
 .PP
 .br
 Print 120 bytes as a continuous hex dump with 20 octets per line.
 .br
 \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR
 .br
-2e544820585844203120224d6179203230323422
+2e544820585844203120224d6172203230323622
 .br
 20224d616e75616c207061676520666f72207878
 .br
@@ -270,7 +273,7 @@ Hex dump the first 120 bytes of this man page with 12 octets per line.
 .br
 00000000: 2e54 4820 5858 4420 3120 224d  .TH XXD 1 "M
 .br
-0000000c: 6179 2032 3032 3422 2022 4d61  ay 2024" "Ma
+0000000c: 6172 2032 3032 3622 2022 4d61  ar 2026" "Ma
 .br
 00000018: 6e75 616c 2070 6167 6520 666f  nual page fo
 .br
@@ -363,6 +366,20 @@ Read single characters from a serial line
 .br
 \fI% echo \-n foo > /dev/term/b\fR
 .PP
+Output in C style include output with terminating zero
+.br
+\fI% echo -n \&"0123456789\&" > digits\fR
+.br
+\fI% xxd -i -t digits\fR
+.br
+unsigned char digits[] = {
+.br
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x00
+.br
+};
+.br
+unsigned int digits_len = 10;
+.PP
 .SH "RETURN VALUES"
 The following error values are returned:
 .TP

runtime/doc/xxd.man

@@ -119,26 +119,29 @@ OPTIONS
               (or if combined with +: before the current stdin file position).
               Without -s option, xxd starts at the current file position.
 
+       -t     When outputting in C include file style  using  -i  include  the
+              terminating zero.
+
        -u     Use upper-case hex letters. Default is lower-case.
 
        -v | -version
               Show version string.
 
 CAVEATS
-       xxd -r has some built-in magic while evaluating  line  number  informa‐
-       tion.   If  the  output  file is seekable, then the line numbers at the
-       start of each hex dump line may be out of order, lines may be  missing,
-       or  overlapping. In these cases xxd will lseek(2) to the next position.
-       If the output file is not seekable, only gaps are allowed,  which  will
+       xxd  -r  has  some built-in magic while evaluating line number informa‐
+       tion.  If the output file is seekable, then the  line  numbers  at  the
+       start  of each hex dump line may be out of order, lines may be missing,
+       or overlapping. In these cases xxd will lseek(2) to the next  position.
+       If  the  output file is not seekable, only gaps are allowed, which will
        be filled by null-bytes.
 
        xxd -r never generates parse errors. Garbage is silently skipped.
 
        When editing hex dumps, please note that xxd -r skips everything on the
        input line after reading enough columns of hexadecimal data (see option
-       -c).  This  also  means that changes to the printable ASCII (or EBCDIC)
+       -c). This also means that changes to the printable  ASCII  (or  EBCDIC)
        columns are always ignored. Reverting a plain (or PostScript) style hex
-       dump with xxd -r -p does not depend on the correct number  of  columns.
+       dump  with  xxd -r -p does not depend on the correct number of columns.
        Here, anything that looks like a pair of hex digits is interpreted.
 
        Note the difference between
@@ -146,28 +149,28 @@ CAVEATS
        and
        % xxd -i < file
 
-       xxd  -s +seek may be different from xxd -s seek, as lseek(2) is used to
+       xxd -s +seek may be different from xxd -s seek, as lseek(2) is used  to
        "rewind" input.  A '+' makes a difference if the input source is stdin,
-       and if stdin's file position is not at the start of  the  file  by  the
-       time  xxd  is  started and given its input.  The following examples may
+       and  if  stdin's  file  position is not at the start of the file by the
+       time xxd is started and given its input.  The  following  examples  may
        help to clarify (or further confuse!):
 
-       Rewind stdin before reading; needed because the `cat' has already  read
+       Rewind  stdin before reading; needed because the `cat' has already read
        to the end of stdin.
        % sh -c "cat > plain_copy; xxd -s 0 > hex_copy" < file
 
-       Hex  dump  from  file position 0x480 (=1024+128) onwards.  The `+' sign
+       Hex dump from file position 0x480 (=1024+128) onwards.   The  `+'  sign
        means "relative to the current position", thus the `128' adds to the 1k
        where dd left off.
-       % sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +128 >  hex_snippet"
+       %  sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +128 > hex_snippet"
        < file
 
        Hex dump from file position 0x100 (=1024-768) onwards.
        % sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +-768 > hex_snippet"
        < file
 
-       However,  this is a rare situation and the use of `+' is rarely needed.
-       The author prefers to monitor the  effect  of  xxd  with  strace(1)  or
+       However, this is a rare situation and the use of `+' is rarely  needed.
+       The  author  prefers  to  monitor  the  effect of xxd with strace(1) or
        truss(1), whenever -s is used.
 
 EXAMPLES
@@ -177,12 +180,12 @@ EXAMPLES
        Print 3 lines (hex 0x30 bytes) from the end of file.
        % xxd -s -0x30 file
 
-       Note:  The  results of the examples below are relevant to the xxd.1 man
-       page as of May 2024
+       Note: The results of the examples below are relevant to the  xxd.1  man
+       page as of March 2026
 
        Print 120 bytes as a continuous hex dump with 20 octets per line.
        % xxd -l 120 -ps -c 20 xxd.1
-       2e544820585844203120224d6179203230323422
+       2e544820585844203120224d6172203230323622
        20224d616e75616c207061676520666f72207878
        64220a2e5c220a2e5c222032317374204d617920
        313939360a2e5c22204d616e2070616765206175
@@ -192,7 +195,7 @@ EXAMPLES
        Hex dump the first 120 bytes of this man page with 12 octets per line.
        % xxd -l 120 -c 12 xxd.1
        00000000: 2e54 4820 5858 4420 3120 224d  .TH XXD 1 "M
-       0000000c: 6179 2032 3032 3422 2022 4d61  ay 2024" "Ma
+       0000000c: 6172 2032 3032 3622 2022 4d61  ar 2026" "Ma
        00000018: 6e75 616c 2070 6167 6520 666f  nual page fo
        00000024: 7220 7878 6422 0a2e 5c22 0a2e  r xxd"..\"..
        00000030: 5c22 2032 3173 7420 4d61 7920  \" 21st May
@@ -214,7 +217,7 @@ EXAMPLES
        % xxd -s 0x33 -l 13 -c 13 xxd.1
        00000033: 3235 7468 204d 6179 2031 3939 36  25th May 1996
 
-       Create a 65537 byte file with all bytes 0x00, except for the  last  one
+       Create  a  65537 byte file with all bytes 0x00, except for the last one
        which is 'A' (hex 0x41).
        % echo "010000: 41" | xxd -r > file
 
@@ -225,11 +228,11 @@ EXAMPLES
        0000fffc: 0000 0000 41                   ....A
 
        Create a 1 byte file containing a single 'A' character.  The number af‐
-       ter  '-r -s' adds to the line numbers found in the file; in effect, the
+       ter '-r -s' adds to the line numbers found in the file; in effect,  the
        leading bytes are suppressed.
        % echo "010000: 41" | xxd -r -s -0x10000 > file
 
-       Use xxd as a filter within an editor such as vim(1) to hex dump  a  re‐
+       Use  xxd  as a filter within an editor such as vim(1) to hex dump a re‐
        gion marked between `a' and `z'.
        :'a,'z!xxd
 
@@ -246,6 +249,14 @@ EXAMPLES
        % stty < /dev/term/b -echo -opost -isig -icanon min 1
        % echo -n foo > /dev/term/b
 
+       Output in C style include output with terminating zero
+       % echo -n "0123456789" > digits
+       % xxd -i -t digits
+       unsigned char digits[] = {
+         0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x00
+       };
+       unsigned int digits_len = 10;
+
 RETURN VALUES
        The following error values are returned:
 
@@ -283,4 +294,4 @@ AUTHOR
        <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
        Small changes by Bram Moolenaar.  Edited by Juergen Weigert.
 
-Manual page for xxd                May 2024                             XXD(1)
+Manual page for xxd                Mar 2026                             XXD(1)

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:		The Vim Project <https://github.com/vim/vim>
-" Last Change:		2026 Feb 18
+" Last Change:		2026 Mar 24
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " If the filetype can be detected from extension or file name(the final path component),
@@ -119,10 +119,13 @@ au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf
 " *.mc omitted - used by dist#ft#McSetf()
 au BufNewFile,BufRead *.demo,*.dm{1,2,3,t},*.wxm,maxima-init.mac setf maxima
 
+" ObjectScript routine or assembly
+au BufNewFile,BufRead *.mac			call dist#ft#FTmac()
+
 " Assembly (all kinds)
 " *.lst is not pure assembly, it has two extra columns (address, byte codes)
 " *.[sS], *.[aA] usually Assembly - GNU
-au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
+au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.lst	call dist#ft#FTasm()
 
 " BASIC or Visual Basic
 au BufNewFile,BufRead *.bas			call dist#ft#FTbas()
@@ -572,6 +575,9 @@ au BufNewFile,BufRead *.pro			call dist#ft#ProtoCheck('idlang')
 " Initng
 au BufNewFile,BufRead */etc/initng/*/*.i,*.ii	setf initng
 
+" Intel HEX or ObjectScript routine
+au BufNewFile,BufRead *.int			call dist#ft#FTint()
+
 " Innovation Data Processing
 au BufNewFile,BufRead upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c	setf upstreamdat
 au BufNewFile,BufRead fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c	setf upstreamlog
@@ -886,6 +892,9 @@ au BufNewFile,BufRead requires/*.txt		setf requirements
 " Pkl
 au BufNewFile,BufRead *.pkl,*.pcf,pkl-lsp://*	setf pkl
 
+" WIC kickstarter files
+au BufNewFile,BufRead *.wks,*.wks.in,*.wks.inc	setf wks
+
 " Povray, Pascal, PHP or assembly
 au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
 
@@ -1571,6 +1580,9 @@ au BufNewFile,BufRead *vimrc*			call s:StarSetf('vim')
 " Subversion commit file
 au BufNewFile,BufRead svn-commit*.tmp		setf svn
 
+" Wireguard config
+au BufNewFile,BufRead */etc/wireguard/*.conf    setf dosini
+
 " X resources file
 au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* call s:StarSetf('xdefaults')
 

runtime/ftplugin/fish.vim

@@ -5,10 +5,15 @@
 " Last Change:  February 1, 2023
 "               2023 Aug 28 by Vim Project (undo_ftplugin)
 "               2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
+"               2026 Mar 16 by Phạm Bình An (add matchit support)
 
 if exists("b:did_ftplugin")
     finish
 endif
+
+let s:saved_cpo = &cpo
+set cpo-=C
+
 let b:did_ftplugin = 1
 
 setlocal iskeyword=@,48-57,_,192-255,-,.
@@ -17,3 +22,20 @@ setlocal commentstring=#\ %s
 setlocal formatoptions+=crjq
 
 let b:undo_ftplugin = "setl cms< com< fo< isk<"
+
+" Define patterns for the matchit plugin
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words =
+      \ '\<\%(else\s\+\)\@<!if\>\|\<\%(switch\|begin\|function\|while\|for\)\>:' ..
+      \ '\<else\%(\s\+if\)\?\>\|\<case\>:' ..
+      \ '\<end\>'
+
+  let b:match_ignorecase = 0
+  let b:match_skip = "S:keyword"
+
+  let b:undo_ftplugin ..= " | unlet! b:match_words b:match_ignorecase b:match_skip"
+endif
+
+" Restore 'cpo' to its original value
+let &cpo = s:saved_cpo
+unlet s:saved_cpo

runtime/ftplugin/wks.vim

@@ -0,0 +1,14 @@
+" Vim filetype plugin file
+" Language:	OpenEmbedded Image Creator (WIC) Kickstarter files wks
+" Maintainer:	Anakin Childerhose <anakin@childerhose.ca>
+" Last Change:	2026 Mar 23
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = 'setlocal com< cms<'

runtime/ftplugin/yara.vim

@@ -0,0 +1,22 @@
+" Vim filetype plugin file
+" Language: YARA
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2026 Mar 17
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal formatoptions-=t formatoptions+=croql
+
+setlocal commentstring=//\ %s
+setlocal comments=s1:/*,mb:*,ex:*/,://
+
+" Undo settings when leaving buffer
+let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<"

runtime/gvim.desktop

@@ -9,9 +9,13 @@ Name[es]=GVim
 Name[fi]=GVim
 Name[fr]=GVim
 Name[ga]=GVim
+Name[hy]=ԳՎիմ
 Name[it]=GVim
-Name[ru]=GVim
+Name[ja]=GVim
+Name[ru]=gVim
 Name[sr]=GVim
+Name[sv]=GVim
+Name[ta]=சிவிம்
 Name[tr]=GVim
 Name[uk]=GVim
 Name[zh_CN]=GVim
@@ -24,12 +28,14 @@ GenericName[es]=Editor de texto
 GenericName[fi]=Tekstinmuokkain
 GenericName[fr]=Éditeur de texte
 GenericName[ga]=Eagarthóir Téacs
+GenericName[hy]=Տեքստի խմբագիր
 GenericName[it]=Editor di testi
 GenericName[ja]=テキストエディタ
 GenericName[ru]=Текстовый редактор
-GenericName[sr]=Едитор текст
+GenericName[sr]=Едитор текста
 GenericName[sv]=Textredigerare
-GenericName[tr]=Metin Düzenleyici
+GenericName[ta]=உரை திருத்தி
+GenericName[tr]=Metin Düzenleyicisi
 GenericName[uk]=Редактор Тексту
 GenericName[zh_CN]=文本编辑器
 GenericName=Text Editor
@@ -41,11 +47,14 @@ Comment[es]=Editar archivos de texto
 Comment[fi]=Muokkaa tekstitiedostoja
 Comment[fr]=Éditer des fichiers texte
 Comment[ga]=Cuir comhaid téacs in eagar
+Comment[hy]=Խմբագրել տեքստային ֆայլերը
 Comment[it]=Edita file di testo
 Comment[ja]=テキストファイルを編集します
-Comment[ru]=Редактирование текстовых файлов
+Comment[ru]=Редактировать текстовые файлы
 Comment[sr]=Уређујте текст фајлове
-Comment[tr]=Metin dosyaları düzenleyin
+Comment[sv]=Redigera textfiler
+Comment[ta]=உரை கோப்புகளைத் திருத்தவும்
+Comment[tr]=Metin dosyalarını düzenleyin
 Comment[uk]=Редагувати текстові файли
 Comment[zh_CN]=编辑文本文件
 Comment=Edit text files
@@ -55,7 +64,6 @@ GenericName[da]=Teksteditor
 GenericName[pl]=Edytor tekstu
 GenericName[is]=Ritvinnsluforrit
 Comment[af]=Redigeer tekslêers
-Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
 Comment[ar]=حرّر ملفات نصية
 Comment[az]=Mətn fayllarını redaktə edin
 Comment[be]=Рэдагаваньне тэкставых файлаў
@@ -102,8 +110,6 @@ Comment[sk]=Úprava textových súborov
 Comment[sl]=Urejanje datotek z besedili
 Comment[sq]=Përpuno files teksti
 Comment[sr@Latn]=Izmeni tekstualne datoteke
-Comment[sv]=Redigera textfiler
-Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
 Comment[th]=แก้ไขแฟ้มข้อความ
 Comment[tk]=Metin faýllary editle
 Comment[vi]=Soạn thảo tập tin văn bản
@@ -121,11 +127,13 @@ Keywords[es]=Texto;editor;
 Keywords[fi]=Teksti;muokkain;editori;
 Keywords[fr]=Texte;éditeur;
 Keywords[ga]=Téacs;eagarthóir;
+Keywords[hy]=Տեքստ;խմբագիր;
 Keywords[it]=Testo;editor;
 Keywords[ja]=テキスト;エディタ;
 Keywords[ru]=текст;текстовый редактор;
 Keywords[sr]=Текст;едитор;
-Keywords[sv]=Text;Redigerare;
+Keywords[sv]=Text;redigerare;
+Keywords[ta]=உரை;திருத்தி;
 Keywords[tr]=Metin;düzenleyici;
 Keywords[uk]=текст;редактор;
 Keywords[zh_CN]=Text;editor;文本;编辑器;

runtime/plugin/manpager.vim

@@ -1,6 +1,8 @@
 " Vim plugin for using Vim as manpager.
 " Maintainer: Enno Nagel <ennonagel+vim@gmail.com>
 " Last Change: 2024 Jul 03
+" 2026 Mar 22 by Vim Project: strip OSC 9 sequences (#19787)
+" 2026 Mar 24 by Vim Project: strip Bell char: Ctrl-G (#19807)
 
 if exists('g:loaded_manpager_plugin')
   finish
@@ -32,6 +34,9 @@ function s:ManPager()
   " Remove ansi sequences
   exe 'silent! keepj keepp %s/\v\e\[%(%(\d;)?\d{1,2})?[mK]//e' .. (&gdefault ? '' : 'g')
 
+  " Remove OSC 8 hyperlink sequences: \e]8;;...\e\ or \e]8;;...<BEL>
+  exe 'silent! keepj keepp %s/\v\e\]8;[^\x07\e]*%(%x07|\e\\)//e' .. (&gdefault ? '' : 'g')
+
   " Remove empty lines above the header
   call cursor(1, 1)
   let n = search(".*(.*)", "c")

runtime/syntax/amiga.vim

@@ -1,89 +1,303 @@
 " Vim syntax file
-" Language:	AmigaDos
-" Maintainer:	This runtime file is looking for a new maintainer.
-" Former Maintainer: Charles E. Campbell
-" Last Change:	Aug 31, 2016
-" Version:     10
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_AMIGA
+" Language:     AmigaDOS
+" Maintainer:   Ola Söder <rolfkopman@gmail.com>
+" First Author: Charles E. Campbell
+" Last Change:  2026 Mar 25
+" Version:      11
 
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
-  finish
+    finish
 endif
 
 syn case ignore
 
-" Amiga Devices
-syn match amiDev "\(par\|ser\|prt\|con\|nil\):"
+" Directives
+syn match amiDirective "^\.\(key\|k\)\>.*$" contains=amiTemplate
+syn match amiDirective "^\.\(bra\|ket\|dot\|dollar\|dol\|def\|default\)\>.*$"
 
-" Amiga aliases and paths
-syn match amiAlias	"\<[a-zA-Z][a-zA-Z0-9]\+:"
-syn match amiAlias	"\<[a-zA-Z][a-zA-Z0-9]\+:[a-zA-Z0-9/]*/"
+" Template arguments
+syn match amiTemplate contained "/[AKSNMF]\>"
 
-" strings
-syn region amiString	start=+"+ end=+"+ oneline contains=@Spell
+" Strings
+syn region amiString start=+"+ end=+"+ oneline contains=amiEscape,amiVar,amiSubst,@Spell
 
-" numbers
-syn match amiNumber	"\<\d\+\>"
+" Escape sequences
+syn match amiEscape contained "\*[nNeE"*]"
 
-" Logic flow
-syn region	amiFlow	matchgroup=Statement start="if"	matchgroup=Statement end="endif"	contains=ALL
-syn keyword	amiFlow	skip endskip
-syn match	amiError	"else\|endif"
-syn keyword	amiElse contained	else
+" Numbers
+syn match amiNumber "\<\d\+\>"
 
-syn keyword	amiTest contained	not warn error fail eq gt ge val exists
+" Variables
+syn match amiVar "\$[a-zA-Z_][a-zA-Z0-9_]*"
+syn match amiVar "\$\$"
 
-" echo exception
-syn region	amiEcho	matchgroup=Statement start="\<echo\>" end="$" oneline contains=amiComment
-syn region	amiEcho	matchgroup=Statement start="^\.[bB][rR][aA]" end="$" oneline
-syn region	amiEcho	matchgroup=Statement start="^\.[kK][eE][tT]" end="$" oneline
+" Parameters
+syn region amiSubst start="<\a" end=">" oneline contains=amiVar
+syn match amiSubst "<\$\$>"
 
-" commands
-syn keyword	amiKey	addbuffers	copy	fault	join	pointer	setdate
-syn keyword	amiKey	addmonitor	cpu	filenote	keyshow	printer	setenv
-syn keyword	amiKey	alias	date	fixfonts	lab	printergfx	setfont
-syn keyword	amiKey	ask	delete	fkey	list	printfiles	setmap
-syn keyword	amiKey	assign	dir	font	loadwb	prompt	setpatch
-syn keyword	amiKey	autopoint	diskchange	format	lock	protect	sort
-syn keyword	amiKey	avail	diskcopy	get	magtape	quit	stack
-syn keyword	amiKey	binddrivers	diskdoctor	getenv	makedir	relabel	status
-syn keyword	amiKey	bindmonitor	display	graphicdump	makelink	remrad	time
-syn keyword	amiKey	blanker		iconedit	more	rename	type
-syn keyword	amiKey	break	ed	icontrol	mount	resident	unalias
-syn keyword	amiKey	calculator	edit	iconx	newcli	run	unset
-syn keyword	amiKey	cd	endcli	ihelp	newshell	say	unsetenv
-syn keyword	amiKey	changetaskpri	endshell	info	nocapslock	screenmode	version
-syn keyword	amiKey	clock	eval	initprinter	nofastmem	search	wait
-syn keyword	amiKey	cmd	exchange	input	overscan	serial	wbpattern
-syn keyword	amiKey	colors	execute	install	palette	set	which
-syn keyword	amiKey	conclip	failat	iprefs	path	setclock	why
+" Devices / assigns / paths
+syn match amiPath "\<[a-zA-Z][a-zA-Z0-9]*:[^ \t]*"
 
-" comments
-syn cluster	amiCommentGroup contains=amiTodo,@Spell
-syn case ignore
-syn keyword	amiTodo	contained	todo
-syn case match
-syn match	amiComment	";.*$" contains=amiCommentGroup
+" Redirection
+syn match amiOperator ">>"
+syn match amiOperator "[<>|]"
 
-" sync
-syn sync lines=50
+" Control flow
+syn region amiIfBlock matchgroup=amiConditional start="\<IF\>" matchgroup=amiConditional end="\<ENDIF\>" contains=ALLBUT,amiIfError
+syn keyword amiIfError ELSE ENDIF
+syn keyword amiElse contained ELSE
+syn keyword amiConditional SKIP ENDSKIP
+syn keyword amiLabel LAB
+syn keyword amiRepeat FOREACH
+
+" Conditions
+syn keyword amiCondition contained NOT WARN ERROR FAIL EQ GT GE VAL EXISTS
+
+" Echo
+syn region amiEcho matchgroup=amiCommand start="\<echo\>" end="$" oneline contains=amiComment,amiVar,amiSubst,amiBacktick,amiEscape
+
+" Commands
+syn keyword amiCommand ADDAUDIOMODES
+syn keyword amiCommand ADDBUFFERS
+syn keyword amiCommand ADDDATATYPES
+syn keyword amiCommand ADDMONITOR
+syn keyword amiCommand ADDNETINTERFACE
+syn keyword amiCommand ADDNETROUTE
+syn keyword amiCommand ALIAS
+syn keyword amiCommand APPLISTINFO
+syn keyword amiCommand ARP
+syn keyword amiCommand ASK
+syn keyword amiCommand ASSIGN
+syn keyword amiCommand AVAIL
+syn keyword amiCommand BINDDRIVERS
+syn keyword amiCommand BINDMONITOR
+syn keyword amiCommand BREAK
+syn keyword amiCommand BUILDMAPTABLE
+syn keyword amiCommand CACHESTAT
+syn keyword amiCommand CD
+syn keyword amiCommand CHANGETASKPRI
+syn keyword amiCommand CHARSETCONVERT
+syn keyword amiCommand CLIP
+syn keyword amiCommand CLOCK
+syn keyword amiCommand CMD
+syn keyword amiCommand CONCLIP
+syn keyword amiCommand CONFIGURENETINTERFACE
+syn keyword amiCommand COPY
+syn keyword amiCommand COUNTLINES
+syn keyword amiCommand CPU
+syn keyword amiCommand CROSSDOS
+syn keyword amiCommand CUT
+syn keyword amiCommand DATE
+syn keyword amiCommand DELETE
+syn keyword amiCommand DELETENETROUTE
+syn keyword amiCommand DIR
+syn keyword amiCommand DISKCHANGE
+syn keyword amiCommand DISKCOPY
+syn keyword amiCommand DISKDOCTOR
+syn keyword amiCommand DISMOUNT
+syn keyword amiCommand ENDCLI
+syn keyword amiCommand ENDSHELL
+syn keyword amiCommand EVAL
+syn keyword amiCommand EXECUTE
+syn keyword amiCommand FAILAT
+syn keyword amiCommand FAULT
+syn keyword amiCommand FDTOOL
+syn keyword amiCommand FILENOTE
+syn keyword amiCommand FILESIZE
+syn keyword amiCommand FORMAT
+syn keyword amiCommand GET
+syn keyword amiCommand GETENV
+syn keyword amiCommand GETNETSTATUS
+syn keyword amiCommand GROUP
+syn keyword amiCommand HELP
+syn keyword amiCommand HI
+syn keyword amiCommand HISTORY
+syn keyword amiCommand IHELP
+syn keyword amiCommand INFO
+syn keyword amiCommand INITPRINTER
+syn keyword amiCommand INPUT
+syn keyword amiCommand INSTALL
+syn keyword amiCommand INTELLIFONT
+syn keyword amiCommand IPMON
+syn keyword amiCommand IPNAT
+syn keyword amiCommand JOIN
+syn keyword amiCommand KDEBUG
+syn keyword amiCommand LAB
+syn keyword amiCommand LIST
+syn keyword amiCommand LOADMONDRVS
+syn keyword amiCommand LOADRESOURCE
+syn keyword amiCommand LOADWB
+syn keyword amiCommand LOCALE
+syn keyword amiCommand LOCK
+syn keyword amiCommand MAKEDIR
+syn keyword amiCommand MAKELINK
+syn keyword amiCommand MEMSTAT
+syn keyword amiCommand MORE
+syn keyword amiCommand MOUNT
+syn keyword amiCommand MOUNTINFO
+syn keyword amiCommand MOVE
+syn keyword amiCommand NETLOGVIEWER
+syn keyword amiCommand NETSHUTDOWN
+syn keyword amiCommand NEWCLI
+syn keyword amiCommand NEWSHELL
+syn keyword amiCommand OWNER
+syn keyword amiCommand PATH
+syn keyword amiCommand PATHPART
+syn keyword amiCommand PIPE
+syn keyword amiCommand POINTER
+syn keyword amiCommand POOLSTAT
+syn keyword amiCommand POPCD
+syn keyword amiCommand PREPCARD
+syn keyword amiCommand PROMPT
+syn keyword amiCommand PROTECT
+syn keyword amiCommand PUSHCD
+syn keyword amiCommand QUIT
+syn keyword amiCommand REBOOT
+syn keyword amiCommand RELABEL
+syn keyword amiCommand RELOADAPPLIST
+syn keyword amiCommand REMOVENETINTERFACE
+syn keyword amiCommand REMRAD
+syn keyword amiCommand RENAME
+syn keyword amiCommand REQUESTCHOICE
+syn keyword amiCommand REQUESTFILE
+syn keyword amiCommand REQUESTSTRING
+syn keyword amiCommand RESIDENT
+syn keyword amiCommand ROADSHOWCONTROL
+syn keyword amiCommand RUN
+syn keyword amiCommand RX
+syn keyword amiCommand RXC
+syn keyword amiCommand RXLIB
+syn keyword amiCommand RXSET
+syn keyword amiCommand SAY
+syn keyword amiCommand SEARCH
+syn keyword amiCommand SET
+syn keyword amiCommand SETCLOCK
+syn keyword amiCommand SETDATE
+syn keyword amiCommand SETDOSDEBUG
+syn keyword amiCommand SETENV
+syn keyword amiCommand SETFONT
+syn keyword amiCommand SETFONTCHARSET
+syn keyword amiCommand SETKEYBOARD
+syn keyword amiCommand SETMAP
+syn keyword amiCommand SETPATCH
+syn keyword amiCommand SHOW68LOADS
+syn keyword amiCommand SHOWAPPLIST
+syn keyword amiCommand SHOWNETSTATUS
+syn keyword amiCommand SMARTCTL
+syn keyword amiCommand SORT
+syn keyword amiCommand SOUNDPLAYER
+syn keyword amiCommand STACK
+syn keyword amiCommand STATUS
+syn keyword amiCommand SWAPCD
+syn keyword amiCommand TYPE
+syn keyword amiCommand UNALIAS
+syn keyword amiCommand UNSET
+syn keyword amiCommand UNSETENV
+syn keyword amiCommand UPTIME
+syn keyword amiCommand URLOPEN
+syn keyword amiCommand VERSION
+syn keyword amiCommand WAIT
+syn keyword amiCommand WAITFORPORT
+syn keyword amiCommand WBRUN
+syn keyword amiCommand WBSTARTUPCTRL
+syn keyword amiCommand WHICH
+syn keyword amiCommand WHY
+
+" Options
+syn keyword amiOption ADD
+syn keyword amiOption ALL
+syn keyword amiOption APPEND
+syn keyword amiOption BACK
+syn keyword amiOption BODY
+syn keyword amiOption BUF
+syn keyword amiOption BUFFER
+syn keyword amiOption CASE
+syn keyword amiOption CHARSET
+syn keyword amiOption CHECK
+syn keyword amiOption CLEAR
+syn keyword amiOption CLONE
+syn keyword amiOption COPYLINKS
+syn keyword amiOption DATES
+syn keyword amiOption DEBUG
+syn keyword amiOption DEVICE
+syn keyword amiOption DIRS
+syn keyword amiOption DRIVE
+syn keyword amiOption FILE
+syn keyword amiOption FILES
+syn keyword amiOption FOLLOWLINKS
+syn keyword amiOption FORCE
+syn keyword amiOption FROM
+syn keyword amiOption FULL
+syn keyword amiOption HARD
+syn keyword amiOption INTERACTIVE
+syn keyword amiOption LFORMAT
+syn keyword amiOption LOAD
+syn keyword amiOption LOCK
+syn keyword amiOption MULTI
+syn keyword amiOption NAME
+syn keyword amiOption NEGATIVE
+syn keyword amiOption NOHEAD
+syn keyword amiOption NONUM
+syn keyword amiOption NOREPLACE
+syn keyword amiOption NOREQ
+syn keyword amiOption NUMERIC
+syn keyword amiOption OFF
+syn keyword amiOption ON
+syn keyword amiOption PATTERN
+syn keyword amiOption POSITIVE
+syn keyword amiOption PREPEND
+syn keyword amiOption PUBSCREEN
+syn keyword amiOption QUICK
+syn keyword amiOption QUIET
+syn keyword amiOption REMOVE
+syn keyword amiOption REPLACE
+syn keyword amiOption RESET
+syn keyword amiOption SAVE
+syn keyword amiOption SHOW
+syn keyword amiOption SINCE
+syn keyword amiOption SOFT
+syn keyword amiOption SORT
+syn keyword amiOption SUB
+syn keyword amiOption TIMEOUT
+syn keyword amiOption TITLE
+syn keyword amiOption TO
+syn keyword amiOption UNLOCK
+syn keyword amiOption UPTO
+syn keyword amiOption VERBOSE
+syn keyword amiOption WITH
+
+" Comments
+syn match amiComment ";.*$" contains=amiTodo,@Spell
+syn match amiComment "^\.\s.*$" contains=amiTodo,@Spell
+syn match amiComment "^\.$"
+
+" Miscellaneous
+syn keyword amiTodo contained TODO FIXME XXX NOTE
+syn region amiBacktick start="`" end="`" oneline
 
 " Define the default highlighting.
 if !exists("skip_amiga_syntax_inits")
-
-  hi def link amiAlias	Type
-  hi def link amiComment	Comment
-  hi def link amiDev	Type
-  hi def link amiEcho	String
-  hi def link amiElse	Statement
-  hi def link amiError	Error
-  hi def link amiKey	Statement
-  hi def link amiNumber	Number
-  hi def link amiString	String
-  hi def link amiTest	Special
-
+    hi def link amiBacktick Special
+    hi def link amiCommand Statement
+    hi def link amiComment Comment
+    hi def link amiCondition Special
+    hi def link amiConditional Conditional
+    hi def link amiDirective PreProc
+    hi def link amiEcho String
+    hi def link amiElse Conditional
+    hi def link amiEscape SpecialChar
+    hi def link amiIfError Error
+    hi def link amiLabel Label
+    hi def link amiNumber Number
+    hi def link amiOperator Operator
+    hi def link amiOption Identifier
+    hi def link amiPath Type
+    hi def link amiRepeat Repeat
+    hi def link amiString String
+    hi def link amiSubst Special
+    hi def link amiTemplate Type
+    hi def link amiTodo Todo
+    hi def link amiVar Special
 endif
-let b:current_syntax = "amiga"
 
-" vim:ts=15
+let b:current_syntax = "amiga"

runtime/syntax/java.vim

@@ -3,7 +3,7 @@
 " Maintainer:		Aliaksei Budavei <0x000c70 AT gmail DOT com>
 " Former Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " Repository:		https://github.com/zzzyxwvut/java-vim.git
-" Last Change:		2026 Feb 06
+" Last Change:		2026 Mar 22
 
 " Please check ":help java.vim" for comments on some of the options
 " available.
@@ -381,7 +381,7 @@ endif
 
 exec 'syn match javaUserLabel "^\s*\<\K\k*\>\%(\<default\>\)\@' . s:ff.Peek('7', '') . '<!\s*::\@!"he=e-1'
 
-if s:ff.IsAnyRequestedPreviewFeatureOf([455, 488, 507])
+if s:ff.IsAnyRequestedPreviewFeatureOf([455, 488, 507, 530])
   syn region  javaLabelRegion	transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":\|->" contains=javaBoolean,javaNumber,javaCharacter,javaString,javaConstant,@javaClasses,javaGenerics,javaType,javaLabelDefault,javaLabelVarType,javaLabelWhenClause
 else
   syn region  javaLabelRegion	transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":\|->" contains=javaLabelCastType,javaLabelNumber,javaCharacter,javaString,javaConstant,@javaClasses,javaGenerics,javaLabelDefault,javaLabelVarType,javaLabelWhenClause

runtime/syntax/sh.vim

@@ -22,6 +22,7 @@
 "		2026 Jan 15 highlight command switches that contain a digit
 "		2026 Feb 11 improve support for KornShell function names and variables
 "		2026 Feb 15 improve comment handling #19414
+"		2026 Mar 23 improve matching of function definitions #19638
 " }}}
 " Version:		208
 " Former URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
@@ -261,7 +262,7 @@ syn cluster shErrorList	contains=shDoError,shIfError,shInError,shCaseError,shEsa
 if exists("b:is_kornshell") || exists("b:is_bash")
     syn cluster ErrorList add=shDTestError
 endif
-syn cluster shArithParenList	contains=shArithmetic,shArithParen,shCaseEsac,shComment,shDeref,shDerefVarArray,shDo,shDerefSimple,shEcho,shEscape,shExpr,shNumber,shOperator,shPosnParm,shExSingleQuote,shExDoubleQuote,shHereString,shRedir,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen,bashSpecialVariables,bashStatement,shIf,shFor,shFunctionKey,shFunctionOne,shFunctionTwo,shNamespaceOne
+syn cluster shArithParenList	contains=shArithmetic,shArithParen,shCaseEsac,shComment,shDeref,shDerefVarArray,shDo,shDerefSimple,shEcho,shEscape,shExpr,shNumber,shOperator,shPosnParm,shExSingleQuote,shExDoubleQuote,shHereString,shRedir,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen,bashSpecialVariables,bashStatement,shIf,shFor
 syn cluster shArithList	contains=@shArithParenList,shParenError
 syn cluster shBracketExprList	contains=shCharClassOther,shCharClass,shCollSymb,shEqClass
 syn cluster shCaseEsacList	contains=shCaseStart,shCaseLabel,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq,@shErrorList,shStringSpecial,shCaseRange
@@ -278,7 +279,16 @@ syn cluster shDerefVarList	contains=shDerefOffset,shDerefOp,shDerefVarArray,shDe
 syn cluster shEchoList	contains=shArithmetic,shBracketExpr,shCommandSub,shCommandSubBQ,shDerefVarArray,shSubshare,shValsub,shDeref,shDerefSimple,shEscape,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shCtrlSeq,shEchoQuote
 syn cluster shExprList1	contains=shBracketExpr,shNumber,shOperator,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shDblBrace,shDeref,shDerefSimple,shCtrlSeq
 syn cluster shExprList2	contains=@shExprList1,@shCaseList,shTest
-syn cluster shFunctionList	contains=shBracketExpr,@shCommandSubList,shCaseEsac,shColon,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shOption,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq
+syn cluster shFunctionCmds	contains=shFor,shCaseEsac,shIf,shRepeat,shDblBrace,shDblParen
+if exists("b:is_ksh88") || exists("b:is_mksh")
+    " Offer "shFunctionCmds" as is.
+elseif exists("b:is_kornshell") || exists("b:is_bash")
+    syn cluster shFunctionCmds	add=shForPP
+else
+    syn cluster shFunctionCmds	remove=shDblBrace,shDblParen
+endif
+syn cluster shFunctionDefList	contains=shDoError,shIfError,shFunctionKey,shFunctionOne,shFunctionThree,shFunctionCmdOne
+syn cluster shFunctionList	contains=shBracketExpr,@shCommandSubList,shCaseEsac,shColon,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shOption,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq,@shFunctionDefList
 if exists("b:is_kornshell") || exists("b:is_bash")
     syn cluster shFunctionList	add=shRepeat,shDblBrace,shDblParen,shForPP
     syn cluster shDerefList	add=shCommandSubList,shEchoDeref
@@ -287,7 +297,7 @@ syn cluster shHereBeginList	contains=@shCommandSubList
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shArithmetic,shCommandSub,shCommandSubBQ,shDerefVarArray,shSubshare,shValsub,shWrapLineOperator,shSetOption,shComment,shDeref,shDerefSimple,shHereString,shNumber,shOperator,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
-syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo,shNamespaceOne
+syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,@shFunctionDefList
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 if exists("b:is_kornshell") || exists("b:is_bash")
     syn cluster shLoopList	add=shForPP,shDblParen
@@ -647,39 +657,52 @@ endif
 
 " Functions: {{{1
 if !exists("b:is_posix")
-    syn keyword shFunctionKey function	skipwhite skipnl nextgroup=shFunctionTwo
+    syn keyword shFunctionKey function	skipwhite skipnl nextgroup=shDoError,shIfError,shFunctionTwo,shFunctionFour,shFunctionCmdTwo
 endif
 
+ShFoldFunctions syn region shFunctionExpr	matchgroup=shFunctionExprRegion start="{"	end="}"	contains=@shFunctionList	 contained skipwhite skipnl nextgroup=shQuickComment
+ShFoldFunctions syn region shFunctionSubSh	matchgroup=shFunctionSubShRegion start="("	end=")"	contains=@shFunctionList	 contained skipwhite skipnl nextgroup=shQuickComment
+
 if exists("b:is_bash")
     syn keyword shFunctionKey coproc
-    ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*[A-Za-z_0-9:][-a-zA-Z_0-9:]*\s*()\_s*{"		end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_0-9:][-a-zA-Z_0-9:]*\>\s*\%(()\)\=\_s*{"	end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*[A-Za-z_0-9:][-a-zA-Z_0-9:]*\s*()\_s*("		end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_0-9:][-a-zA-Z_0-9:]*\>\s*\%(()\)\=\_s*)"	end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+    syn match shFunctionCmdOne	"^\s*\zs\%(\<\k\+\|[^()<>|&$;\t ]\+\)\+\s*()\ze\_s*\%(\%(for\|case\|select\|if\|while\|until\)\>\|\[\[\s\|((\)"	skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionCmdTwo	"\%(\<\k\+\>\|[^()<>|&$;\t ]\+\)\+\ze\s*\%(()\ze\)\=\_s*\%(\<\%(for\|case\|select\|if\|while\|until\)\>\|\[\[\s\|((\)"	contained skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionOne	"^\s*\zs\%(\<\k\+\|[^()<>|&$;\t ]\+\)\+\s*()\ze\_s*{"	skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionTwo	"\%(\<\k\+\|[^()<>|&$;\t ]\+\)\+\ze\s*\%(()\ze\)\=\_s*{"	contained skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionThree	"^\s*\zs\%(\<\k\+\|[^()<>|&$;\t ]\+\)\+\s*()\ze\_s*((\@!"	skipwhite skipnl nextgroup=shFunctionSubSh
+    syn match shFunctionFour	"\%(\<\k\+\|[^()<>|&$;\t ]\+\)\+\ze\s*\%(\%(()\ze\)\=\)\@>\_s*((\@!"	contained skipwhite skipnl nextgroup=shFunctionSubSh
 elseif exists("b:is_ksh88")
     " AT&T ksh88
-    ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*[A-Za-z_][A-Za-z_0-9]*\s*()\_s*{"		end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_][A-Za-z_0-9]*\>\_s*{"		end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*[A-Za-z_][A-Za-z_0-9]*\s*()\_s*("		end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_][A-Za-z_0-9]*\>\_s*("		end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+    syn match shFunctionCmdOne	"^\s*\zs\h\w*\s*()\ze\_s*\%(\%(for\|case\|select\|if\|while\|until\)\>\|\[\[\s\|((\)"	skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionOne	"^\s*\zs\h\w*\s*()\ze\_s*{"	skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionTwo	"\<\h\w*\>\ze\_s*{"	contained skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionThree	"^\s*\zs\h\w*\s*()\ze\_s*((\@!"	skipwhite skipnl nextgroup=shFunctionSubSh
 elseif exists("b:is_mksh")
     " MirBSD ksh is the wild west of absurd and abstruse function names...
-    ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\s*()\_s*{"		end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\>\s*\%(()\)\=\_s*{"	end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\s*()\_s*("		end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\>\s*\%(()\)\=\_s*("	end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+    syn match shFunctionCmdOne	"^\s*\zs[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\s*()\ze\_s*\%(\%(for\|case\|select\|if\|while\|until\)\>\|\[\[\s\|((\)"	skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionOne	"^\s*\zs[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\s*()\ze\_s*{"	skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionTwo	"\%([@!+.%,:-]\+\|\<\w\+\)*[-A-Za-z_.%,0-9:]\ze\s*\%(()\ze\)\=\_s*{"	contained skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionThree	"^\s*\zs[-A-Za-z_@!+.%,0-9:]*[-A-Za-z_.%,0-9:]\s*()\ze\_s*((\@!"	skipwhite skipnl nextgroup=shFunctionSubSh
 elseif exists("b:is_kornshell")
     " ksh93
-    ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*[A-Za-z_.][A-Za-z_.0-9]*\s*()\_s*{"		end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_.][A-Za-z_.0-9]*\>\_s*{"		end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*[A-Za-z_.][A-Za-z_.0-9]*\s*()\_s*("		end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_.][A-Za-z_.0-9]*\>\_s*("		end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shNamespaceOne	matchgroup=shFunction start="\%(do\)\@!\&\<\h\w*\>\_s*{"			end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+    syn match shFunctionCmdOne	"^\s*\zs[A-Za-z_.][A-Za-z_.0-9]*\s*()\ze\_s*\%(\%(for\|case\|select\|if\|while\|until\)\>\|\[\[\s\|((\)"	skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionOne	"^\s*\zs[A-Za-z_.][A-Za-z_.0-9]*\s*()\ze\_s*{"	skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionTwo	"\%(\.\|\<\h\+\)[A-Za-z_.0-9]*\ze\_s*{"	contained skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionThree	"^\s*\zs[A-Za-z_.][A-Za-z_.0-9]*\s*()\ze\_s*((\@!"	skipwhite skipnl nextgroup=shFunctionSubSh
+    syn match shNamespaceOne	"\<\h\w*\>\ze\_s*{"	contained skipwhite skipnl nextgroup=shFunctionExpr
 else
-    ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*\h\w*\s*()\_s*{"			end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<\h\w*\>\s*\%(()\)\=\_s*{"		end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*\h\w*\s*()\_s*("			end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
-    ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<\h\w*\>\s*\%(()\)\=\_s*("		end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+    syn match shFunctionCmdOne	"^\s*\zs\h\w*\s*()\ze\_s*\%(for\|case\|if\|while\|until\)\>"	skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionCmdTwo	"\<\h\w*\s*()\ze\_s*\%(for\|case\|if\|while\|until\)\>"	contained skipwhite skipnl nextgroup=@shFunctionCmds
+    syn match shFunctionOne	"^\s*\zs\h\w*\s*()\ze\_s*{"	skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionTwo	"\<\h\w*\>\s*()\ze\_s*{"	contained skipwhite skipnl nextgroup=shFunctionExpr
+    syn match shFunctionThree	"^\s*\zs\h\w*\s*()\ze\_s*("	skipwhite skipnl nextgroup=shFunctionSubSh
+    syn match shFunctionFour	"\<\h\w*\>\s*()\ze\_s*("	contained skipwhite skipnl nextgroup=shFunctionSubSh
+endif
+
+if !exists("g:sh_no_error")
+    syn match   shDoError "\<do\%(ne\)\=\s*()"
+    syn match   shIfError "\<then\s*()"
+    syn match   shIfError "\<else\s*()"
 endif
 
 " Parameter Dereferencing: {{{1
@@ -882,7 +905,6 @@ if !exists("skip_sh_syntax_inits")
     hi def link shEchoDelim	shOperator
     hi def link shEchoQuote	shString
     hi def link shForPP	shLoop
-    hi def link shFunction	Function
     hi def link shEmbeddedEcho	shString
     hi def link shEscape	shCommandSub
     hi def link shExDoubleQuote	shDoubleQuote
@@ -960,8 +982,16 @@ if !exists("skip_sh_syntax_inits")
     hi def link shConditional		Conditional
     hi def link shCtrlSeq		Special
     hi def link shExprRegion		Delimiter
-    hi def link shFunctionKey		Function
-    hi def link shFunctionName		Function
+    hi def link shFunctionKey		Keyword
+    hi def link shFunctionOne		Function
+    hi def link shFunctionTwo		shFunctionOne
+    hi def link shFunctionThree		shFunctionOne
+    hi def link shFunctionFour		shFunctionOne
+    hi def link shFunctionCmdOne	shFunctionOne
+    hi def link shFunctionCmdTwo	shFunctionOne
+    hi def link shFunctionExprRegion	shExprRegion
+    hi def link shFunctionSubShRegion	shSubShRegion
+    hi def link shNamespaceOne		Function
     hi def link shNumber		Number
     hi def link shOperator		Operator
     hi def link shRepeat		Repeat

runtime/syntax/testdir/dumps/java_previews_455_00.dump

@@ -1,4 +1,4 @@
->/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|s|y|n|t|a|x|_|p|r|e|v|i|e|w|s| |=| |[|4|5@1|,| |4|8@1|,| |5|0|7|]| +0#0000000&@12
+>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|s|y|n|t|a|x|_|p|r|e|v|i|e|w|s| |=| |[|4|5@1|,| |4|8@1|,| |5|0|7|,| |5|3|0|]| +0#0000000&@7
 @75
 @75
 @75

runtime/syntax/testdir/dumps/sh_06_00.dump

@@ -11,7 +11,7 @@
 |#+0#0000e05&| +0#0000000&@73
 |#+0#0000e05&| |D|i|s|p|l|a|y| |s|o|m|e| |H|e|l|p| +0#0000000&@55
 |#+0#0000e05&| +0#0000000&@73
-|U+0#00e0e07&|s|a|g|e| |(|)| |{| +0#0000000&@64
+|U+0#00e0e07&|s|a|g|e| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @75
 |#+0#0000e05&| |d|o|e|s| |t|h|i|s| |c|o|m@1|e|n|t| |w|o|r|k|?| +0#0000000&@49
 |V+0#00e0e07&|a|r|i|a|b|l|e|N|a|m|e|=+0#0000000&|"+0#af5f00255&|$+0#e000e06&|{|B|a|s|i|c|C|o|n|f|i|g|N|a|m|e|}|_+0#e000002&|*|"+0#af5f00255&| +0#0000000&@39

runtime/syntax/testdir/dumps/sh_06_01.dump

@@ -1,4 +1,4 @@
-|U+0#00e0e07#ffffff0|s|a|g|e| |(|)| |{| +0#0000000&@64
+|U+0#00e0e07#ffffff0|s|a|g|e| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @75
 |#+0#0000e05&| |d|o|e|s| |t|h|i|s| |c|o|m@1|e|n|t| |w|o|r|k|?| +0#0000000&@49
 |V+0#00e0e07&|a|r|i|a|b|l|e|N|a|m|e|=+0#0000000&|"+0#af5f00255&|$+0#e000e06&|{|B|a|s|i|c|C|o|n|f|i|g|N|a|m|e|}|_+0#e000002&|*|"+0#af5f00255&| +0#0000000&@39

runtime/syntax/testdir/dumps/sh_06_02.dump

@@ -14,7 +14,7 @@
 @75
 |"+0#af5f00255&| +0#0000000&@73
 @75
-|}+0#00e0e07&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |U|s|a|g|e| +0#0000000&@58
+|}+0#e000e06&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |U|s|a|g|e| +0#0000000&@58
 @75
 @75
 @57|3|5|,|1| @9|5@1|%| 

runtime/syntax/testdir/dumps/sh_06_03.dump

@@ -4,13 +4,13 @@
 |#+0#0000e05&| +0#0000000&@73
 |#+0#0000e05&| |C|r|e|a|t|e| |a| |b|a|c|k|u|p| |u|s|i|n|g| |f|b|a|c|k|u|p|/|f|r|e|c|o|v|e|r| +0#0000000&@34
 >#+0#0000e05&| +0#0000000&@73
-|E+0#00e0e07&|x|e|c|u|t|e|F|b|a|c|k|u|p| |(|)| |{| +0#0000000&|#+0#0000e05&| |T|E|S|T|I|N|G| +0#0000000&@45
+|E+0#00e0e07&|x|e|c|u|t|e|F|b|a|c|k|u|p| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&|#+0#0000e05&| |T|E|S|T|I|N|G| +0#0000000&@45
 @75
 |[+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|D|e|b|u|g|S|c|r|i|p|t|"+0#af5f00255&| +0#0000000&|]+0#af5f00255&| +0#0000000&@3|&+0#af5f00255&@1| +0#0000000&|s+0#af5f00255&|e|t| +0#00e0e07&|-+0#e000e06&|x| +0#00e0e07&||+0#af5f00255&@1| +0#0000000&|s+0#af5f00255&|e|t| +0#00e0e07&|++0#e000e06&|x| +0#0000000&@33
 @75
 |c+0#af5f00255&|d| +0#0000000&|$+0#e000e06&|c|w|d| +0#0000000&@67
 @75
-|}+0#00e0e07&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |E|x|e|c|u|t|e|F|b|a|c|k|u|p| +0#0000000&@49
+|}+0#e000e06&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |E|x|e|c|u|t|e|F|b|a|c|k|u|p| +0#0000000&@49
 @75
 @75
 |#+0#0000e05&@74

runtime/syntax/testdir/dumps/sh_07_00.dump

@@ -14,7 +14,7 @@
 | | +0#0000000&@73
 |#+0#0000e05&| |a|v|a|i|l|a|b|l|e|!| +0#0000000&@62
 |#+0#0000e05&| +0#0000000&@73
-|F+0#00e0e07&|u|n|c|t|i|o|n|1| |(|)| |{| +0#0000000&@60
+|F+0#00e0e07&|u|n|c|t|i|o|n|1| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@60
 @75
 |e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|F+0#e000002&|u|n|c|t|i|o|n|1|:| |f|o|r| |l|o@1|p| |i|n|s|i|d|e| |a| |f|u|n|c|t|i|o|n|:|\+0#e000e06&|t|\|c|"+0#af5f00255&| +0#0000000&@25
 |i|s|_|d|a|s|h|:| |1|,| |i|s|_|p|o|s|i|x|:| |1|,| |i|s|_|s|h|:| |1|,| @22|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_07_01.dump

@@ -2,7 +2,7 @@
 | | +0#0000000&@73
 |#+0#0000e05&| |a|v|a|i|l|a|b|l|e|!| +0#0000000&@62
 |#+0#0000e05&| +0#0000000&@73
-|F+0#00e0e07&|u|n|c|t|i|o|n|1| |(|)| |{| +0#0000000&@60
+|F+0#00e0e07&|u|n|c|t|i|o|n|1| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@60
 @75
 >e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|F+0#e000002&|u|n|c|t|i|o|n|1|:| |f|o|r| |l|o@1|p| |i|n|s|i|d|e| |a| |f|u|n|c|t|i|o|n|:|\+0#e000e06&|t|\|c|"+0#af5f00255&| +0#0000000&@25
 |[+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|*|"+0#af5f00255&| +0#0000000&|]+0#af5f00255&| +0#0000000&||+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|n+0#e000002&|o|n|e|\+0#e000e06&|c|"+0#af5f00255&| +0#0000000&@49
@@ -13,7 +13,7 @@
 |d+0#af5f00255&|o|n|e| +0#0000000&@70
 |e+0#af5f00255&|c|h|o| +0#0000000&@70
 @75
-|}+0#00e0e07&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|1| +0#0000000&@54
+|}+0#e000e06&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|1| +0#0000000&@54
 @75
 |#+0#0000e05&@74
 @5| +0#0000000&@69

runtime/syntax/testdir/dumps/sh_07_02.dump

@@ -3,7 +3,7 @@
 |#+0#0000e05&| +0#0000000&@73
 |#+0#0000e05&| |F|o|r| |l|o@1|p| |w|i|t|h| |'|i|n| |l|i|s|t|'| |$|*| +0#0000000&@46
 |#+0#0000e05&| +0#0000000&@73
->F+0#00e0e07&|u|n|c|t|i|o|n|2| |(|)| |{| +0#0000000&@60
+>F+0#00e0e07&|u|n|c|t|i|o|n|2| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@60
 @75
 |e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|F+0#e000002&|u|n|c|t|i|o|n|2|:| |f|o|r| |l|o@1|p| |i|n|s|i|d|e| |a| |f|u|n|c|t|i|o|n|:|\+0#e000e06&|t|\|c|"+0#af5f00255&| +0#0000000&@25
 |f+0#af5f00255&|o|r| +0#0000000&|V|a|r| |i+0#af5f00255&|n| +0#0000000&|$+0#e000e06&|*| +0#0000000&@61
@@ -11,7 +11,7 @@
 @4|[+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&|$+0#e000e06&|V|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|]+0#af5f00255&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|O+0#e000002&|K| |\+0#e000e06&|c|"+0#af5f00255&| +0#e000002&||+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|n+0#e000002&|o| |\+0#e000e06&|c|"+0#af5f00255&| +0#0000000&@26
 |d+0#af5f00255&|o|n|e| +0#0000000&|;+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&@63
 @75
-|}+0#00e0e07&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|2| +0#0000000&@54
+|}+0#e000e06&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|2| +0#0000000&@54
 @75
 |#+0#0000e05&@74
 @5| +0#0000000&@69

runtime/syntax/testdir/dumps/sh_07_03.dump

@@ -1,6 +1,6 @@
 |#+0#0000e05#ffffff0| |F|o|r| |l|o@1|p| |w|i|t|h| |'|i|n| |l|i|s|t|'| |$|@|.| |W|o|r|k|s| |t|h|e| |s|a|m|e| |w|a|y| |a|s| |$|*| +0#0000000&@20
 |#+0#0000e05&| +0#0000000&@73
-|F+0#00e0e07&|u|n|c|t|i|o|n|3| |(|)| |{| +0#0000000&@60
+|F+0#00e0e07&|u|n|c|t|i|o|n|3| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@60
 @75
 |e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|F+0#e000002&|u|n|c|t|i|o|n|3|:| |f|o|r| |l|o@1|p| |i|n|s|i|d|e| |a| |f|u|n|c|t|i|o|n|:|\+0#e000e06&|t|\|c|"+0#af5f00255&| +0#0000000&@25
 >f+0#af5f00255&|o|r| +0#0000000&|V|a|r| |i+0#af5f00255&|n| +0#0000000&|$+0#e000e06&|@| +0#0000000&@61
@@ -8,13 +8,13 @@
 @4|[+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&|$+0#e000e06&|V|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|]+0#af5f00255&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|O+0#e000002&|K| |\+0#e000e06&|c|"+0#af5f00255&| +0#e000002&||+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|n+0#e000002&|o| |\+0#e000e06&|c|"+0#af5f00255&| +0#0000000&@26
 |d+0#af5f00255&|o|n|e| +0#0000000&|;+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&@63
 @75
-|}+0#00e0e07&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|3| +0#0000000&@54
+|}+0#e000e06&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|3| +0#0000000&@54
 @75
 |#+0#0000e05&@74
 @5| +0#0000000&@69
 |#+0#0000e05&| +0#0000000&@73
 |#+0#0000e05&| |F|o|r| |l|o@1|p| |w|i|t|h| |'|i|n| |l|i|s|t|'| |"|$|@|"|.| |S|p|e|c|i|a|l| |c|a|s|e|.| |W|o|r|k|s| |l|i|k|e| |"|$|1|"| |"|$|2|"| |.@2| +0#0000000&@4
 |#+0#0000e05&| +0#0000000&@73
-|F+0#00e0e07&|u|n|c|t|i|o|n|4| |(|)| |{| +0#0000000&@60
+|F+0#00e0e07&|u|n|c|t|i|o|n|4| |(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@60
 @75
 @57|4|8|,|1| @9|5|6|%| 

runtime/syntax/testdir/dumps/sh_07_04.dump

@@ -5,7 +5,7 @@
 @4|[+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&|$+0#e000e06&|V|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|]+0#af5f00255&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|O+0#e000002&|K| |\+0#e000e06&|c|"+0#af5f00255&| +0#e000002&||+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|n+0#e000002&|o| |\+0#e000e06&|c|"+0#af5f00255&| +0#0000000&@26
 >d+0#af5f00255&|o|n|e| +0#0000000&|;+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&@63
 @75
-|}+0#00e0e07&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|4| +0#0000000&@54
+|}+0#e000e06&| +0#0000000&|#+0#0000e05&| |E|n|d| |o|f| |F|u|n|c|t|i|o|n|4| +0#0000000&@54
 @75
 @75
 |#+0#0000e05&@74

runtime/syntax/testdir/dumps/sh_functions_bash_00.dump

@@ -0,0 +1,20 @@
+| +0#0000e05#a8a8a8255@1>#+0&#ffffff0|!|/|b|i|n|/|b|a|s|h| +0#0000000&@61
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |f|e|n| |f|d|c|=|2| |f|d|l|=|8| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@20
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|s|h|_|f|o|l|d|_|e|n|a|b|l|e|d| |=| |1| |+| |2| |+| |4| +0#0000000&@22
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#af5f00255#ffffff0|y|p|e|s|e|t| +0#0000000&|-+0#e000e06&|i| +0#0000000&|n+0#00e0e07&|=+0#0000000&|0+0#e000002&| +0#0000000&@58
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o@1|s|i|e|(|)| +0#0000000&|(+0#e000e06&@1|n+0#0000000&|++0#af5f00255&|=|1+0#e000002&|)+0#e000e06&@1|;+0#0000000&| |d|o@1|s|i|e| @47
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o|n|e@1|(|)| +0#0000000&|[+0#e000e06&@1| +0#0000000&|-+0#af5f00255&|n| +0#0000000&|$+0#e000e06&|#| +0#0000000&|]+0#e000e06&@1|;+0#0000000&| |d|o|n|e@1| @46
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#00e0e07#ffffff0|h|e|n|c|e|(|)| +0#0000000&@64
+| +0#0000e05#a8a8a8255@1|u+0#af5f00255#ffffff0|n|t|i|l| |:| +0#0000000&@65
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:| @67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+|i|s|_|b|a|s|h|:| |1|,| @45|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_functions_bash_01.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| >e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+||+0#0000e05#a8a8a8255| |t+0#af5f00255#ffffff0|h|e|n| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|f+0#af5f00255&|i|;+0#0000000&| |e|l|s|e|w|h|e|r|e| @51
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |s+0#00e0e07#ffffff0|e|l|e|c|t|o|r|(|)| +0#0000000&|s+0#af5f00255&|e|l|e|c|t| |x+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&|;+0#0000000&| |d+0#af5f00255&|o| +0#0000000&@42
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|b+0#af5f00255&|r|e|a|k| +0#0000000&@63
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|e|l|e|c|t|o|r| |0+0#e000002&|<+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| |2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| ||@1| |:| @35
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|c+0#00e0e07#ffffff0|a|s|e|d|(|)| +0#0000000&|c+0#af5f00255&|a|s|e| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|#|"+0#af5f00255&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|*|)+0#af5f00255&| +0#0000000&|:|;+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|s|a|c|;+0#0000000&| |c|a|s|e|d| @33
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|f+0#00e0e07#ffffff0|o|r|e|(|)| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|o|r| +0#0000000&|x| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:| @67
+@57|1|9|,|1| @9|3|6|%| 

runtime/syntax/testdir/dumps/sh_functions_bash_02.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:| @67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o|r|e| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|i+0#00e0e07#ffffff0|f@1|y|(|)| +0#0000000&|f+0#af5f00255&|o|r| |(@1|;@1|)@1| +0#0000000&@55
+|-+0#0000e05#a8a8a8255| >d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|b+0#af5f00255&|r|e|a|k| +0#0000000&@63
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|f@1|y| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| |:+0#0000000&|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|!+0#00e0e07&|?|#|(|)| +0#0000000&@54
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|(+0#af5f00255&| +0#0000000&@67
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|@+0#00e0e07&|α|!| +0#0000000&|{+0#e000e06&| +0#0000000&@50
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@51
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|}+0#e000e06&| +0#0000000&@63
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|@|α|!+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@56
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|)+0#af5f00255&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|v|a|l| +0#0000000&|!+0#af5f00255&|?+0#0000000&|\+0#e000e06&|#| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@54
+@57|3|7|,|1| @9|8|6|%| 

runtime/syntax/testdir/dumps/sh_functions_bash_03.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|v|a|l| +0#0000000&|!+0#af5f00255&|?+0#0000000&|\+0#e000e06&|#| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@54
+||+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|i| +0#0000000&@70
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|n+0#00e0e07#ffffff0|a|m|e|s|p|a|c|e| |(|)| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |{+0#e000e06#ffffff0| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|#|;+0#af5f00255&| +0#0000000&@62
+||+0#0000e05#a8a8a8255| >}+0#e000e06#ffffff0|;+0#0000000&| |n|a|m|e|s|p|a|c|e| |$+0#e000e06&|@| +0#0000000&@57
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|5@1|,|1| @9|B|o|t| 

runtime/syntax/testdir/dumps/sh_functions_dash_00.dump

@@ -0,0 +1,20 @@
+| +0#0000e05#a8a8a8255@1>#+0&#ffffff0|!|/|b|i|n|/|d|a|s|h| +0#0000000&@61
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |f|e|n| |f|d|c|=|2| |f|d|l|=|8| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@20
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|s|h|_|f|o|l|d|_|e|n|a|b|l|e|d| |=| |1| |+| |2| |+| |4| +0#0000000&@22
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#00e0e07#ffffff0|h|e|n|c|e|(|)| +0#0000000&@64
+| +0#0000e05#a8a8a8255@1|u+0#af5f00255#ffffff0|n|t|i|l| |:| +0#0000000&@65
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+||+0#0000e05#a8a8a8255| |t+0#af5f00255#ffffff0|h|e|n| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|f+0#af5f00255&|i|;+0#0000000&| |e|l|s|e|w|h|e|r|e| @51
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|c+0#00e0e07#ffffff0|a|s|e|d|(|)| +0#0000000&|c+0#af5f00255&|a|s|e| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|#|"+0#af5f00255&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|*|)+0#af5f00255&| +0#0000000&|:|;+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|s|a|c|;+0#0000000&| |c|a|s|e|d| @33
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|i|s|_|d|a|s|h|:| |1|,| |i|s|_|p|o|s|i|x|:| |1|,| |i|s|_|s|h|:| |1|,| @22|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_functions_dash_01.dump

@@ -0,0 +1,20 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+||+0#0000e05#a8a8a8255| |t+0#af5f00255#ffffff0|h|e|n| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|f+0#af5f00255&|i|;+0#0000000&| |e|l|s|e|w|h|e|r|e| @51
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|c+0#00e0e07#ffffff0|a|s|e|d|(|)| +0#0000000&|c+0#af5f00255&|a|s|e| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|#|"+0#af5f00255&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|*|)+0#af5f00255&| +0#0000000&|:|;+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|s|a|c|;+0#0000000&| |c|a|s|e|d| @33
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|f+0#00e0e07#ffffff0|o|r|e|(|)| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|o|r| +0#0000000&|x| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o|r|e| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| |:+0#0000000&|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|i+0#00e0e07&|d|2|(|)| +0#0000000&@63
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|(+0#af5f00255&| +0#0000000&@67
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i+0#00e0e07&|d|1|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@51
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|}+0#e000e06&| +0#0000000&@63
+@57|1|9|,|0|-|1| @7|6|1|%| 

runtime/syntax/testdir/dumps/sh_functions_dash_02.dump

@@ -0,0 +1,20 @@
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|}+0#e000e06&| +0#0000000&@63
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i|d|1| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@56
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|)+0#af5f00255&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|i|d|2| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@60
+||+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|i| +0#0000000&@70
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|f+0#00e0e07#ffffff0|u|n|c|t|i|o|n| |(|)| +0#0000000&@61
+|-+0#0000e05#a8a8a8255| |{+0#e000e06#ffffff0| +0#0000000&|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|#|;+0#af5f00255&| +0#0000000&@62
+||+0#0000e05#a8a8a8255| |}+0#e000e06#ffffff0|;+0#0000000&| |f|u|n|c|t|i|o|n| |$+0#e000e06&|@| +0#0000000&@58
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|3|7|,|0|-|1| @7|B|o|t| 

runtime/syntax/testdir/dumps/sh_functions_ksh2020_00.dump

@@ -0,0 +1,20 @@
+| +0#0000e05#a8a8a8255@1>#+0&#ffffff0|!|/|b|i|n|/|k|s|h|2|0|2|0| +0#0000000&@58
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |f|e|n| |f|d|c|=|2| |f|d|l|=|8| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@20
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|s|h|_|f|o|l|d|_|e|n|a|b|l|e|d| |=| |1| |+| |2| |+| |4| +0#0000000&@22
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#af5f00255#ffffff0|y|p|e|s|e|t| +0#0000000&|-+0#e000e06&|i| +0#0000000&|1+0#e000002&|0| +0#0000000&|n+0#00e0e07&|=+0#0000000&|0+0#e000002&| +0#0000000&@55
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o@1|s|i|e|(|)| +0#0000000&|(+0#e000e06&@1|n+0#0000000&|++0#af5f00255&|=|1+0#e000002&|)+0#e000e06&@1|;+0#0000000&| |d|o@1|s|i|e| @47
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o|n|e@1|(|)| +0#0000000&|[+0#e000e06&@1| +0#0000000&|-+0#af5f00255&|n| +0#0000000&|$+0#e000e06&|#| +0#0000000&|]+0#e000e06&@1|;+0#0000000&| |d|o|n|e@1| @46
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#00e0e07#ffffff0|h|e|n|c|e|(|)| +0#0000000&@64
+| +0#0000e05#a8a8a8255@1|u+0#af5f00255#ffffff0|n|t|i|l| |:| +0#0000000&@65
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+|i|s|_|k|o|r|n|s|h|e|l@1|:| |1|,| |i|s|_|k|s|h|2|0|2|0|:| |1|,| @25|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_functions_ksh2020_01.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| >e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+||+0#0000e05#a8a8a8255| |t+0#af5f00255#ffffff0|h|e|n| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|f+0#af5f00255&|i|;+0#0000000&| |e|l|s|e|w|h|e|r|e| @51
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |s+0#00e0e07#ffffff0|e|l|e|c|t|o|r|(|)| +0#0000000&|s+0#af5f00255&|e|l|e|c|t| |x+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&|;+0#0000000&| |d+0#af5f00255&|o| +0#0000000&@42
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|b+0#af5f00255&|r|e|a|k| +0#0000000&@63
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|e|l|e|c|t|o|r| |0+0#e000002&|<+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| |2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| ||@1| |:| @35
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|c+0#00e0e07#ffffff0|a|s|e|d|(|)| +0#0000000&|c+0#af5f00255&|a|s|e| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|#|"+0#af5f00255&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|*|)+0#af5f00255&| +0#0000000&|:|;+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|s|a|c|;+0#0000000&| |c|a|s|e|d| @33
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|f+0#00e0e07#ffffff0|o|r|e|(|)| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|o|r| +0#0000000&|x| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+@57|1|9|,|1| @9|4|0|%| 

runtime/syntax/testdir/dumps/sh_functions_ksh2020_02.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o|r|e| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|i+0#00e0e07#ffffff0|f@1|y|(|)| +0#0000000&|f+0#af5f00255&|o|r| |(@1|;@1|)@1| +0#0000000&@55
+|-+0#0000e05#a8a8a8255| >d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|b+0#af5f00255&|r|e|a|k| +0#0000000&@63
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|f@1|y| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| |:+0#0000000&|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|i+0#00e0e07&|d|_|(|)| +0#0000000&@63
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|(+0#af5f00255&| +0#0000000&@67
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|n+0#00e0e07&|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@48
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|n|"+0#af5f00255&| +0#0000000&@51
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|}+0#e000e06&| +0#0000000&@63
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|d|o@1|s|i|e| @58
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|)+0#af5f00255&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|i|d|_| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@60
+@57|3|7|,|1| @9|9|6|%| 

runtime/syntax/testdir/dumps/sh_functions_ksh2020_03.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|i|d|_| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@60
+||+0#0000e05#a8a8a8255| >f+0#af5f00255#ffffff0|i| +0#0000000&@70
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|5|1|,|1| @9|B|o|t| 

runtime/syntax/testdir/dumps/sh_functions_ksh88_00.dump

@@ -0,0 +1,20 @@
+| +0#0000e05#a8a8a8255@1>#+0&#ffffff0|!|/|b|i|n|/|k|s|h|8@1| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |f|e|n| |f|d|c|=|2| |f|d|l|=|8| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@20
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|s|h|_|f|o|l|d|_|e|n|a|b|l|e|d| |=| |1| |+| |2| |+| |4| +0#0000000&@22
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#af5f00255#ffffff0|y|p|e|s|e|t| +0#0000000&|-+0#e000e06&|i| +0#0000000&|1+0#e000002&|0| +0#0000000&|n+0#00e0e07&|=+0#0000000&|0+0#e000002&| +0#0000000&@55
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o@1|s|i|e|(|)| +0#0000000&|(+0#e000e06&@1|n+0#0000000&|++0#af5f00255&|=|1+0#e000002&|)+0#e000e06&@1|;+0#0000000&| |d|o@1|s|i|e| @47
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o|n|e@1|(|)| +0#0000000&|[+0#e000e06&@1| +0#0000000&|-+0#af5f00255&|n| +0#0000000&|$+0#e000e06&|#| +0#0000000&|]+0#e000e06&@1|;+0#0000000&| |d|o|n|e@1| @46
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#00e0e07#ffffff0|h|e|n|c|e|(|)| +0#0000000&@64
+| +0#0000e05#a8a8a8255@1|u+0#af5f00255#ffffff0|n|t|i|l| |:| +0#0000000&@65
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+|i|s|_|k|o|r|n|s|h|e|l@1|:| |1|,| |i|s|_|k|s|h|8@1|:| |1|,| @27|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_functions_ksh88_01.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| >e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+||+0#0000e05#a8a8a8255| |t+0#af5f00255#ffffff0|h|e|n| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|f+0#af5f00255&|i|;+0#0000000&| |e|l|s|e|w|h|e|r|e| @51
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |s+0#00e0e07#ffffff0|e|l|e|c|t|o|r|(|)| +0#0000000&|s+0#af5f00255&|e|l|e|c|t| |x+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&|;+0#0000000&| |d+0#af5f00255&|o| +0#0000000&@42
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|b+0#af5f00255&|r|e|a|k| +0#0000000&@63
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|e|l|e|c|t|o|r| |0+0#e000002&|<+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| |2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| ||@1| |:| @35
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|c+0#00e0e07#ffffff0|a|s|e|d|(|)| +0#0000000&|c+0#af5f00255&|a|s|e| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|#|"+0#af5f00255&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|*|)+0#af5f00255&| +0#0000000&|:|;+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|s|a|c|;+0#0000000&| |c|a|s|e|d| @33
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|f+0#00e0e07#ffffff0|o|r|e|(|)| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|o|r| +0#0000000&|x| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+@57|1|9|,|1| @9|5|0|%| 

runtime/syntax/testdir/dumps/sh_functions_ksh88_02.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o|r|e| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| |:+0#0000000&|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>i+0#00e0e07&|d|2|(|)| +0#0000000&@63
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|(+0#af5f00255&| +0#0000000&@67
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|i+0#00e0e07&|d|1| +0#0000000&|{+0#e000e06&| +0#0000000&@50
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@51
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|}+0#e000e06&| +0#0000000&@63
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i|d|1| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@56
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|)+0#af5f00255&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|i|d|2| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@60
+||+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|i| +0#0000000&@70
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|3|7|,|5| @9|B|o|t| 

runtime/syntax/testdir/dumps/sh_functions_mksh_00.dump

@@ -0,0 +1,20 @@
+| +0#0000e05#a8a8a8255@1>#+0&#ffffff0|!|/|b|i|n|/|m|k|s|h| +0#0000000&@61
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |f|e|n| |f|d|c|=|2| |f|d|l|=|8| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@20
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|s|h|_|f|o|l|d|_|e|n|a|b|l|e|d| |=| |1| |+| |2| |+| |4| +0#0000000&@22
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#af5f00255#ffffff0|y|p|e|s|e|t| +0#0000000&|-+0#e000e06&|i|1|0| +0#0000000&|n+0#00e0e07&|=+0#0000000&|0+0#e000002&| +0#0000000&@56
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o@1|s|i|e|(|)| +0#0000000&|(+0#e000e06&@1|n+0#0000000&|++0#af5f00255&|=|1+0#e000002&|)+0#e000e06&@1|;+0#0000000&| |d|o@1|s|i|e| @47
+| +0#0000e05#a8a8a8255@1|d+0#00e0e07#ffffff0|o|n|e@1|(|)| +0#0000000&|[+0#e000e06&@1| +0#0000000&|-+0#af5f00255&|n| +0#0000000&|$+0#e000e06&|#| +0#0000000&|]+0#e000e06&@1|;+0#0000000&| |d|o|n|e@1| @46
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|t+0#00e0e07#ffffff0|h|e|n|c|e|(|)| +0#0000000&@64
+| +0#0000e05#a8a8a8255@1|u+0#af5f00255#ffffff0|n|t|i|l| |:| +0#0000000&@65
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+|i|s|_|k|o|r|n|s|h|e|l@1|:| |1|,| |i|s|_|m|k|s|h|:| |1|,| @28|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_functions_mksh_01.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|t+0#0000000#ffffff0|h|e|n|c|e| @66
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|w+0#00e0e07#ffffff0|h|i|l|e|s|(|)| +0#0000000&|w+0#af5f00255&|h|i|l|e| |f|a|l|s|e|;| |d|o| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|d+0#af5f00255&|o|n|e|;+0#0000000&| |w|h|i|l|e|s| @32
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| >e+0#00e0e07#ffffff0|l|s|e|w|h|e|r|e|(|)| +0#0000000&|i+0#af5f00255&|f| |:+0#0000000&| @56
+||+0#0000e05#a8a8a8255| |t+0#af5f00255#ffffff0|h|e|n| +0#0000000&|:|;+0#af5f00255&| +0#0000000&|f+0#af5f00255&|i|;+0#0000000&| |e|l|s|e|w|h|e|r|e| @51
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |s+0#00e0e07#ffffff0|e|l|e|c|t|o|r|(|)| +0#0000000&|s+0#af5f00255&|e|l|e|c|t| |x+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&|;+0#0000000&| |d+0#af5f00255&|o| +0#0000000&@42
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|b+0#af5f00255&|r|e|a|k| +0#0000000&@63
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|e|l|e|c|t|o|r| |0+0#e000002&|<+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| |2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1| ||@1| |:| @35
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|c+0#00e0e07#ffffff0|a|s|e|d|(|)| +0#0000000&|c+0#af5f00255&|a|s|e| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|#|"+0#af5f00255&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|*|)+0#af5f00255&| +0#0000000&|:|;+0#af5f00255&@1| +0#0000000&|e+0#af5f00255&|s|a|c|;+0#0000000&| |c|a|s|e|d| @33
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|f+0#00e0e07#ffffff0|o|r|e|(|)| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|o|r| +0#0000000&|x| |i+0#af5f00255&|n| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o| +0#0000000&@70
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+@57|1|9|,|1| @9|5|0|%| 

runtime/syntax/testdir/dumps/sh_functions_mksh_02.dump

@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|:+0#0000e05&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|o|n|e| +0#0000000&@68
+| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o|r|e| @68
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| |:+0#0000000&|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>%+0#00e0e07&@2|(|)| +0#0000000&@63
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|(+0#af5f00255&| +0#0000000&@67
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|@+0#00e0e07&|a|:|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@48
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@51
+|3+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|}+0#e000e06&| +0#0000000&@63
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|@|a|:| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@56
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|)+0#af5f00255&| +0#0000000&@67
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|%@2| |"+0#af5f00255&|$+0#e000e06&|1|"+0#af5f00255&| +0#0000000&@60
+||+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|i| +0#0000000&@70
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|3|7|,|5| @9|B|o|t| 

runtime/syntax/testdir/dumps/sh_generic_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{|||v|a|l|s|u|b|f|u|n|c| |t|e|n|}| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{|||v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;+0#af5f00255&|}+0#e000e06&|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{|||v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_generic_10.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| |{| +0#0000000&@57
+|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| |{| +0#0000000&@50
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@50
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_generic_11.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| |{| +0#0000000&@62
+|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
->}+0#00e0e07&| +0#0000000&@73
+>}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| |{| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@55
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| |(| +0#0000000&@59
+|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| +0#0000000&|(+0#af5f00255&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |s|u|b|s|h|e|l@1| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@21
-|)+0#00e0e07&| +0#0000000&@73
+|)+0#af5f00255&| +0#0000000&@73
 @75
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| |{| +0#0000000&@58
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@65
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
 @57|1|7|2|,|1| @8|8@1|%| 

runtime/syntax/testdir/dumps/sh_generic_12.dump

@@ -1,14 +1,14 @@
 | +0&#ffffff0@74
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
 @8|:+0#0000e05&| +0#0000000&@65
 |}+0#e000e06&| +0#0000000&@73
 @75
->n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
+>n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| +0#0000000&@51
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_ksh2020_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|e|n|}+0#e000e06#ffffff0| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_ksh2020_10.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| |{| +0#0000000&@57
+|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| |{| +0#0000000&@50
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@50
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_ksh2020_11.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| |{| +0#0000000&@62
+|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
->}+0#00e0e07&| +0#0000000&@73
+>}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| |{| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@55
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| |(| +0#0000000&@59
+|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| +0#0000000&|(+0#af5f00255&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |s|u|b|s|h|e|l@1| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@21
-|)+0#00e0e07&| +0#0000000&@73
+|)+0#af5f00255&| +0#0000000&@73
 @75
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| |{| +0#0000000&@58
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@65
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
 @57|1|7|2|,|1| @8|8@1|%| 

runtime/syntax/testdir/dumps/sh_ksh2020_12.dump

@@ -1,14 +1,14 @@
 | +0&#ffffff0@74
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
 @8|:+0#0000e05&| +0#0000000&@65
 |}+0#e000e06&| +0#0000000&@73
 @75
->n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
+>n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| +0#0000000&@51
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_ksh88_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|e|n|}+0#e000e06#ffffff0| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_ksh88_10.dump

@@ -3,18 +3,18 @@
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
 |}+0#e000e06&| +0#0000000&@73
 @75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.|s|h|.|t|i|l|d|e|.|s+0#af5f00255&|e|t| +0#00e0e07&|{+0#e000e06&| +0#0000000&@50
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.|s|h|.|t|i|l|d|e|.|s+0#af5f00255&|e|t| +0#00e0e07&|{+0#e000e06&| +0#0000000&@50
 | +0#00e0e07&@7|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_ksh88_11.dump

@@ -1,11 +1,11 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
 |f|o@1|4|.|g|e|t|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
 >}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|5|.|s+0#af5f00255&|e|t| +0#00e0e07&|{+0#e000e06&| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|5|.|s+0#af5f00255&|e|t| +0#00e0e07&|{+0#e000e06&| +0#0000000&@55
 | +0#00e0e07&@7|:+0#0000e05&| +0#00e0e07&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_ksh88_12.dump

@@ -8,7 +8,7 @@
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_ksh93_generic_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|e|n|}+0#e000e06#ffffff0| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_ksh93_generic_10.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| |{| +0#0000000&@57
+|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| |{| +0#0000000&@50
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@50
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_ksh93_generic_11.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| |{| +0#0000000&@62
+|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
->}+0#00e0e07&| +0#0000000&@73
+>}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| |{| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@55
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| |(| +0#0000000&@59
+|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| +0#0000000&|(+0#af5f00255&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |s|u|b|s|h|e|l@1| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@21
-|)+0#00e0e07&| +0#0000000&@73
+|)+0#af5f00255&| +0#0000000&@73
 @75
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| |{| +0#0000000&@58
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@65
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
 @57|1|7|2|,|1| @8|8@1|%| 

runtime/syntax/testdir/dumps/sh_ksh93_generic_12.dump

@@ -1,14 +1,14 @@
 | +0&#ffffff0@74
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
 @8|:+0#0000e05&| +0#0000000&@65
 |}+0#e000e06&| +0#0000000&@73
 @75
->n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
+>n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| +0#0000000&@51
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_ksh93u_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|e|n|}+0#e000e06#ffffff0| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_ksh93u_10.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| |{| +0#0000000&@57
+|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| |{| +0#0000000&@50
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@50
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_ksh93u_11.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| |{| +0#0000000&@62
+|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
->}+0#00e0e07&| +0#0000000&@73
+>}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| |{| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@55
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| |(| +0#0000000&@59
+|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| +0#0000000&|(+0#af5f00255&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |s|u|b|s|h|e|l@1| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@21
-|)+0#00e0e07&| +0#0000000&@73
+|)+0#af5f00255&| +0#0000000&@73
 @75
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| |{| +0#0000000&@58
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@65
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
 @57|1|7|2|,|1| @8|8@1|%| 

runtime/syntax/testdir/dumps/sh_ksh93u_12.dump

@@ -1,14 +1,14 @@
 | +0&#ffffff0@74
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
 @8|:+0#0000e05&| +0#0000000&@65
 |}+0#e000e06&| +0#0000000&@73
 @75
->n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
+>n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| +0#0000000&@51
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_ksh93v_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|e|n|}+0#e000e06#ffffff0| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{||+0#ffffff16#ff404010|v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}+0#e000e06#ffffff0|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_ksh93v_10.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| |{| +0#0000000&@57
+|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| |{| +0#0000000&@50
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@50
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f|o@1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_ksh93v_11.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| |{| +0#0000000&@62
+|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
->}+0#00e0e07&| +0#0000000&@73
+>}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| |{| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@55
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| |(| +0#0000000&@59
+|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| +0#0000000&|(+0#af5f00255&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |s|u|b|s|h|e|l@1| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@21
-|)+0#00e0e07&| +0#0000000&@73
+|)+0#af5f00255&| +0#0000000&@73
 @75
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| |{| +0#0000000&@58
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|_+0#00e0e07&|f|o@1| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@65
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
 @57|1|7|2|,|1| @8|8@1|%| 

runtime/syntax/testdir/dumps/sh_ksh93v_12.dump

@@ -1,14 +1,14 @@
 | +0&#ffffff0@74
-|n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
+|n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|1|b|a|d|.|i|n|v|a|l|i|d| |{+0#e000e06&| +0#0000000&@50
 @8|:+0#0000e05&| +0#0000000&@65
 |}+0#e000e06&| +0#0000000&@73
 @75
->n+0#00e0e07&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
+>n+0#af5f00255&|a|m|e|s|p|a|c|e| +0#0000000&|f|o@1|1|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| +0#0000000&@51
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_mksh_07.dump

@@ -3,9 +3,9 @@
 |#+0#0000e05&| |V|a|l|u|e| |s|u|b|s|t|i|t|u|t|i|o|n|s| |o|f| |t|h|e| |f|o|r|m| |$|{|||c|o|m@1|a|n|d|}| |a|r|e| |o|n|l|y| +0#0000000&@20
 |#+0#0000e05&| |s|u|p@1|o|r|t|e|d| |b|y| |m|k|s|h|,| |n|o|t| |k|s|h|9|3|.| +0#0000000&@43
 |i+0#af5f00255&|f| |!| +0#0000000&|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|e+0#af5f00255&|v|a|l| +0#0000000&|'+0#af5f00255&|(+0#e000002&@1|.|s|h|.|v|e|r|s|i|o|n| |>|=| |2|0@1|7|0|7|0|3|)@1|'+0#af5f00255&| +0#0000000&|2+0#e000002&|>+0#af5f00255&|/+0#0000000&|d|e|v|/|n|u|l@1|;+0#af5f00255&| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@9
-| +0#00e0e07&@7>v|a|l|s|u|b|f|u|n|c|(|)| |{| +0#0000000&@52
+@8>v+0#00e0e07&|a|l|s|u|b|f|u|n|c|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @16|R+0#e000e06&|E|P|L|Y|=+0#af5f00255&|$+0#e000e06&|1| +0#0000000&@50
-@8|}+0#00e0e07&| +0#0000000&@65
+@8|}+0#e000e06&| +0#0000000&@65
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|$+0#e000e06&|{|||v|a|l|s|u|b|f|u|n|c| |t|e|n|}| +0#0000000&@43
 @8|p+0#af5f00255&|r|i|n|t| +0#e000002&|"+0#af5f00255&|$+0#e000e06&|{|||v|a|l|s|u|b|f|u|n|c| |e|l|e|v|e|n|;+0#af5f00255&|}+0#e000e06&|"+0#af5f00255&| +0#0000000&@36
 @8|p+0#af5f00255&|r|i|n|t|f| +0#0000000&|'+0#af5f00255&|%+0#e000002&|s|'+0#af5f00255&| +0#0000000&|"+0#af5f00255&|$+0#e000e06&|{|||v|a|l|s|u|b|f|u|n|c| |t|w|e|l|v|e| @6|}|"+0#af5f00255&| +0#0000000&@24

runtime/syntax/testdir/dumps/sh_mksh_10.dump

@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| |{| +0#0000000&@57
+|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@57
 @8|t+0#af5f00255&|r|u|e| +0#0000000&@62
-|}+0#00e0e07&| +0#0000000&@73
-@75
->f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|.|s|h|.|t|i|l|d|e|.|s+0#af5f00255&|e|t| +0#00e0e07&|{+0#e000e06&| +0#0000000&@50
-| +0#00e0e07&@7|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|(|)| |{| +0#0000000&@58
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|.+0#00e0e07&|s|h|.|t|i|l|d|e|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@50
+@8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
+|}+0#e000e06&| +0#0000000&@73
+@75
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |B|a|s|h|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| |(|m|k|s|h|-|o|n|l|y|)| +0#0000000&@30
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| |{| +0#0000000&@59
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|2| +0#0000000&|{+0#e000e06&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |f|u|n|c|t|i|o|n| +0#0000000&@37
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|3|(|)| |{| +0#0000000&@66
+|f+0#00e0e07&|o@1|3|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
 @57|1|5|4|,|1| @8|7|9|%| 

runtime/syntax/testdir/dumps/sh_mksh_11.dump

@@ -1,17 +1,17 @@
 | +0&#ffffff0@7|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X| |f|u|n|c|t|i|o|n| +0#0000000&@47
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| |{| +0#0000000&@62
+|f+0#00e0e07&|o@1|4|.|g|e|t|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@62
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@24
->}+0#00e0e07&| +0#0000000&@73
+>}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| |{| +0#0000000&@55
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|f+0#00e0e07&|o@1|5|.|s|e|t| +0#0000000&|{+0#e000e06&| +0#0000000&@55
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |K|o|r|n|S|h|e|l@1|-|s|t|y|l|e| |k|s|h|9|3| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@20
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| |(| +0#0000000&@59
+|_+0#00e0e07&|f|o@1|6|.|u|n|s|e|t|(|)| +0#0000000&|(+0#af5f00255&| +0#0000000&@59
 @8|:+0#0000e05&| +0#0000000&@1|#+0#0000e05&| |P|O|S|I|X|-|s|t|y|l|e| |s|u|b|s|h|e|l@1| |d|i|s|c|i|p|l|i|n|e| |f|u|n|c|t|i|o|n| +0#0000000&@21
-|)+0#00e0e07&| +0#0000000&@73
+|)+0#af5f00255&| +0#0000000&@73
 @75
 |n|a|m|e|s|p|a|c|e| |_|f|o@1| |{+0#e000e06&| +0#0000000&@58
 @8|:+0#0000e05&| +0#0000000&@65

runtime/syntax/testdir/dumps/sh_mksh_12.dump

@@ -8,7 +8,7 @@
 |}+0#e000e06&| +0#0000000&@73
 @75
 |#+0#0000e05&| |B|a|d| |s|y|n|t|a|x| |(|n|o| |n|a|m|e|)| +0#0000000&@52
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|{+0#e000e06&| +0#0000000&@64
 @8|f+0#af5f00255&|a|l|s|e| +0#0000000&@61
 |}+0#e000e06&| +0#0000000&@73
 @75

runtime/syntax/testdir/dumps/sh_mksh_gibberish_00.dump

@@ -3,18 +3,18 @@
 @75
 |#+0#0000e05&| |V|a|l|i|d| |f|u|n|c|t|i|o|n| |n|a|m|e|s| +0#0000000&@52
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|7+0#00e0e07&|f|o|@|o|.|f|(|)| |{| +0#0000000&@54
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|7+0#00e0e07&|f|o|@|o|.|f|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@54
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|"+0#af5f00255&|G+0#e000002&|i|b@1|e|r|i|s|h| |n|o|t|-|K|o|r|n|S|h|e|l@1| |f|u|n|c|t|i|o|n| |(|t|h|e| |e|n|d|i|n|g| |'|(|)|'| |i|s| |a| |b|a|s|h|i|s
 |m| |m|k|s|h| |a|l@1|o|w|s|)|"+0#af5f00255&| +0#0000000&@59
-|}+0#00e0e07&| +0#0000000&@73
-|!+0#00e0e07&|:|@|-|+|.|8|v|f|o|%|o|,|_|(|)| |{| +0#0000000&@56
+|}+0#e000e06&| +0#0000000&@73
+|!+0#00e0e07&|:|@|-|+|.|8|v|f|o|%|o|,|_|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@56
 @8|e+0#af5f00255&|c|h|o| +0#e000002&|'+0#af5f00255&|G+0#e000002&|i|b@1|e|r|i|s|h| |P|O|S|I|X| |f|u|n|c|t|i|o|n|'+0#af5f00255&| +0#0000000&@35
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|,+0#00e0e07&|(|)| |{| +0#0000000&@69
+|,+0#00e0e07&|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@69
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|a+0#00e0e07&|%|a|(|)| |{| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|a+0#00e0e07&|%|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8|f|o@1| @63
 |i|s|_|k|o|r|n|s|h|e|l@1|:| |1|,| |i|s|_|m|k|s|h|:| |1|,| @28|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/sh_mksh_gibberish_01.dump

@@ -1,20 +1,20 @@
-|,+0#00e0e07#ffffff0|(|)| |{| +0#0000000&@69
+|,+0#00e0e07#ffffff0|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@69
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|f+0#00e0e07&|u|n|c|t|i|o|n| +0#0000000&|a+0#00e0e07&|%|a|(|)| |{| +0#0000000&@58
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|a+0#00e0e07&|%|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@58
 @8>f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|%+0#00e0e07&|(|)| |{| +0#0000000&@69
+|%+0#00e0e07&|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@69
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|.+0#00e0e07&|(|)| |{| +0#0000000&@69
+|.+0#00e0e07&|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@69
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|-+0#00e0e07&|(|)| |{| +0#0000000&@69
+|-+0#00e0e07&|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@69
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @57|1|8|,|2|-|9| @7|1@1|%| 

runtime/syntax/testdir/dumps/sh_mksh_gibberish_02.dump

@@ -1,20 +1,20 @@
-|}+0#00e0e07#ffffff0| +0#0000000&@73
+|}+0#e000e06#ffffff0| +0#0000000&@73
 @75
-|_+0#00e0e07&|(|)| |{| +0#0000000&@69
+|_+0#00e0e07&|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@69
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 > @74
-|++0#00e0e07&|a|(|)| |{| +0#0000000&@68
+|++0#00e0e07&|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@68
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|.+0#00e0e07&|b|(|)| |{| +0#0000000&@68
+|.+0#00e0e07&|b|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@68
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|!+0#00e0e07&|a|(|)| |{| +0#0000000&@68
+|!+0#00e0e07&|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@68
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|@+0#00e0e07&|a|(|)| |{| +0#0000000&@68
+|@+0#00e0e07&|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@68
 @57|3|6|,|0|-|1| @7|2|8|%| 

runtime/syntax/testdir/dumps/sh_mksh_gibberish_03.dump

@@ -1,20 +1,20 @@
-|@+0#00e0e07#ffffff0|a|(|)| |{| +0#0000000&@68
+|@+0#00e0e07#ffffff0|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@68
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|!+0#00e0e07&@1|a|(|)| |{| +0#0000000&@67
+|!+0#00e0e07&@1|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@67
 @8>f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|!+0#00e0e07&|a|!|a|(|)| |{| +0#0000000&@66
+|!+0#00e0e07&|a|!|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|@+0#00e0e07&|a|@@1|a|(|)| |{| +0#0000000&@65
+|@+0#00e0e07&|a|@@1|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@65
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @75
-|++0#00e0e07&|a|+|a|(|)| |{| +0#0000000&@66
+|++0#00e0e07&|a|+|a|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@66
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 @57|5|4|,|2|-|9| @7|4@1|%| 

runtime/syntax/testdir/dumps/sh_mksh_gibberish_04.dump

@@ -1,8 +1,8 @@
-|}+0#00e0e07#ffffff0| +0#0000000&@73
+|}+0#e000e06#ffffff0| +0#0000000&@73
 @75
-|a+0#00e0e07&|:|(|)| |{| +0#0000000&@68
+|a+0#00e0e07&|:|(|)| +0#0000000&|{+0#e000e06&| +0#0000000&@68
 @8|f|o@1| @63
-|}+0#00e0e07&| +0#0000000&@73
+|}+0#e000e06&| +0#0000000&@73
 > @74
 |#+0#0000e05&| |I|n|v|a|l|i|d| |f|u|n|c|t|i|o|n| |n|a|m|e|s| +0#0000000&@50
 |@|a|@|(+0#e000e06&|)| +0#0000000&|{+0#e000e06&| +0#0000000&@67

runtime/syntax/testdir/input/java_previews_455.java

@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507]
+// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507, 530]
 
 
 

runtime/syntax/testdir/input/sh_functions_bash.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+
+
+typeset -i n=0
+doosie() ((n+=1)); doosie
+donee() [[ -n $# ]]; donee
+
+thence()
+until :
+do
+    :
+done
+thence
+
+whiles() while false; do :; done; whiles
+
+elsewhere() if :
+then :; fi; elsewhere
+
+selector() select x in 1 2; do
+    break
+done
+selector 0</dev/null 2>/dev/null || :
+
+cased() case "$#" in *) :;; esac; cased
+
+fore()
+for x in 1 2
+do
+    :
+done
+fore
+
+iffy() for ((;;))
+do
+    break
+done
+iffy
+
+if :; then
+    function !?#()
+    (
+        function @α! {
+            echo "$1"
+        }
+        @α! "$1"
+    )
+    eval !?\# "$1"
+fi
+
+namespace ()
+{ echo $#;
+}; namespace $@

runtime/syntax/testdir/input/sh_functions_dash.sh

@@ -0,0 +1,40 @@
+#!/bin/dash
+# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+
+
+thence()
+until :
+do
+    :
+done
+thence
+
+whiles() while false; do :; done; whiles
+
+elsewhere() if :
+then :; fi; elsewhere
+
+cased() case "$#" in *) :;; esac; cased
+
+fore()
+for x in 1 2
+do
+    :
+done
+fore
+
+if :; then
+    id2()
+    (
+        id1() {
+            echo "$1"
+        }
+        id1 "$1"
+    )
+    id2 "$1"
+fi
+
+function ()
+{ echo $#;
+}; function $@

runtime/syntax/testdir/input/sh_functions_ksh2020.sh

@@ -0,0 +1,51 @@
+#!/bin/ksh2020
+# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+
+
+typeset -i 10 n=0
+doosie() ((n+=1)); doosie
+donee() [[ -n $# ]]; donee
+
+thence()
+until :
+do
+    :
+done
+thence
+
+whiles() while false; do :; done; whiles
+
+elsewhere() if :
+then :; fi; elsewhere
+
+selector() select x in 1 2; do
+    break
+done
+selector 0</dev/null 2>/dev/null || :
+
+cased() case "$#" in *) :;; esac; cased
+
+fore()
+for x in 1 2
+do
+    :
+done
+fore
+
+iffy() for ((;;))
+do
+    break
+done
+iffy
+
+if :; then
+    id_()
+    (
+        function n.set {
+            echo "$n"
+        }
+        doosie
+    )
+    id_ "$1"
+fi

runtime/syntax/testdir/input/sh_functions_ksh88.sh

@@ -0,0 +1,45 @@
+#!/bin/ksh88
+# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+
+
+typeset -i 10 n=0
+doosie() ((n+=1)); doosie
+donee() [[ -n $# ]]; donee
+
+thence()
+until :
+do
+    :
+done
+thence
+
+whiles() while false; do :; done; whiles
+
+elsewhere() if :
+then :; fi; elsewhere
+
+selector() select x in 1 2; do
+    break
+done
+selector 0</dev/null 2>/dev/null || :
+
+cased() case "$#" in *) :;; esac; cased
+
+fore()
+for x in 1 2
+do
+    :
+done
+fore
+
+if :; then
+    id2()
+    (
+        function id1 {
+            echo "$1"
+        }
+        id1 "$1"
+    )
+    id2 "$1"
+fi

runtime/syntax/testdir/input/sh_functions_mksh.sh

@@ -0,0 +1,45 @@
+#!/bin/mksh
+# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+
+
+typeset -i10 n=0
+doosie() ((n+=1)); doosie
+donee() [[ -n $# ]]; donee
+
+thence()
+until :
+do
+    :
+done
+thence
+
+whiles() while false; do :; done; whiles
+
+elsewhere() if :
+then :; fi; elsewhere
+
+selector() select x in 1 2; do
+    break
+done
+selector 0</dev/null 2>/dev/null || :
+
+cased() case "$#" in *) :;; esac; cased
+
+fore()
+for x in 1 2
+do
+    :
+done
+fore
+
+if :; then
+    %%%()
+    (
+        function @a:() {
+            echo "$1"
+        }
+        @a: "$1"
+    )
+    %%% "$1"
+fi

runtime/syntax/wks.vim

@@ -0,0 +1,29 @@
+" Vim syntax file
+" Language:	OpenEmbedded Image Creator (WIC) Kickstarter files wks
+" Maintainer:	Anakin Childerhose <anakin@childerhose.ca>
+" Last Change:	2026 Mar 23
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+
+syn match wksComment "#.*$"
+syn match wksCommand "\<bootloader\>"
+syn match wksCommand "\<\(part\|partition\)\>" skipwhite nextgroup=wksMountPoint
+syn match wksMountPoint "\(/[^ \t]*\|swap\)" contained
+
+syn match wksOption "--[a-zA-Z_-]\+"
+
+hi def link wksComment    Comment
+hi def link wksCommand    Statement
+hi def link wksMountPoint Identifier
+hi def link wksOption     Special
+
+let b:current_syntax = "wks"
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/vim.desktop

@@ -9,9 +9,13 @@ Name[es]=Vim
 Name[fi]=Vim
 Name[fr]=Vim
 Name[ga]=Vim
+Name[hy]=Վիմ
 Name[it]=Vim
+Name[ja]=Vim
 Name[ru]=Vim
 Name[sr]=Vim
+Name[sv]=Vim
+Name[ta]=விம்
 Name[tr]=Vim
 Name[uk]=Vim
 Name[zh_CN]=Vim
@@ -24,12 +28,14 @@ GenericName[es]=Editor de texto
 GenericName[fi]=Tekstinmuokkain
 GenericName[fr]=Éditeur de texte
 GenericName[ga]=Eagarthóir Téacs
+GenericName[hy]=Տեքստի խմբագիր
 GenericName[it]=Editor di testi
 GenericName[ja]=テキストエディタ
 GenericName[ru]=Текстовый редактор
-GenericName[sr]=Едитор текст
+GenericName[sr]=Едитор текста
 GenericName[sv]=Textredigerare
-GenericName[tr]=Metin Düzenleyici
+GenericName[ta]=உரை திருத்தி
+GenericName[tr]=Metin Düzenleyicisi
 GenericName[uk]=Редактор Тексту
 GenericName[zh_CN]=文本编辑器
 GenericName=Text Editor
@@ -41,11 +47,14 @@ Comment[es]=Editar archivos de texto
 Comment[fi]=Muokkaa tekstitiedostoja
 Comment[fr]=Éditer des fichiers texte
 Comment[ga]=Cuir comhaid téacs in eagar
+Comment[hy]=Խմբագրել տեքստային ֆայլերը
 Comment[it]=Edita file di testo
 Comment[ja]=テキストファイルを編集します
-Comment[ru]=Редактирование текстовых файлов
+Comment[ru]=Редактировать текстовые файлы
 Comment[sr]=Уређујте текст фајлове
-Comment[tr]=Metin dosyaları düzenleyin
+Comment[sv]=Redigera textfiler
+Comment[ta]=உரை கோப்புகளைத் திருத்தவும்
+Comment[tr]=Metin dosyalarını düzenleyin
 Comment[uk]=Редагувати текстові файли
 Comment[zh_CN]=编辑文本文件
 Comment=Edit text files
@@ -55,7 +64,6 @@ GenericName[da]=Teksteditor
 GenericName[pl]=Edytor tekstu
 GenericName[is]=Ritvinnsluforrit
 Comment[af]=Redigeer tekslêers
-Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
 Comment[ar]=حرّر ملفات نصية
 Comment[az]=Mətn fayllarını redaktə edin
 Comment[be]=Рэдагаваньне тэкставых файлаў
@@ -102,8 +110,6 @@ Comment[sk]=Úprava textových súborov
 Comment[sl]=Urejanje datotek z besedili
 Comment[sq]=Përpuno files teksti
 Comment[sr@Latn]=Izmeni tekstualne datoteke
-Comment[sv]=Redigera textfiler
-Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
 Comment[th]=แก้ไขแฟ้มข้อความ
 Comment[tk]=Metin faýllary editle
 Comment[vi]=Soạn thảo tập tin văn bản
@@ -121,10 +127,13 @@ Keywords[es]=Texto;editor;
 Keywords[fi]=Teksti;muokkain;editori;
 Keywords[fr]=Texte;éditeur;
 Keywords[ga]=Téacs;eagarthóir;
+Keywords[hy]=Տեքստ;խմբագիր;
 Keywords[it]=Testo;editor;
 Keywords[ja]=テキスト;エディタ;
 Keywords[ru]=текст;текстовый редактор;
 Keywords[sr]=Текст;едитор;
+Keywords[sv]=Text;redigerare;
+Keywords[ta]=உரை;திருத்தி;
 Keywords[tr]=Metin;düzenleyici;
 Keywords[uk]=текст;редактор;
 Keywords[zh_CN]=Text;editor;文本;编辑器;

src/Make_cyg_ming.mak

@@ -25,7 +25,14 @@
 #     http://www.matcode.com/mpress.htm
 #
 # Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
-# Last Update: 2025 May 14.
+# Last Update: 2026 Mar 22.
+
+# If you want to build some optional features without modifying the source, you
+# can set EXTRA_DEFINES on the command line. Here's an example of setting
+# MODIFIED_BY:
+#
+#	mingw-make -f Make_ming.mvc \
+#	  'EXTRA_DEFINES=-DMODIFIED_BY=\"yourmail@example.com\"'
 
 #>>>>> choose options:
 # FEATURES=[TINY | NORMAL | HUGE]
@@ -536,7 +543,8 @@ endif # RUBY
 # Any other defines can be included here.
 DEF_GUI=-DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD
 DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
-	-DHAVE_PATHDEF -DFEAT_$(FEATURES) -DHAVE_STDINT_H
+	-DHAVE_PATHDEF -DFEAT_$(FEATURES) -DHAVE_STDINT_H \
+	$(EXTRA_DEFINES)
 
 #>>>>> end of choices
 ###########################################################################

src/alloc.c

@@ -496,7 +496,9 @@ free_all_mem(void)
 
 	set_bufref(&bufref, buf);
 	nextbuf = buf->b_next;
-	close_buffer(NULL, buf, DOBUF_WIPE, FALSE, FALSE);
+	// All windows were freed.  Reset b_nwindows so buffers can be wiped.
+	buf->b_nwindows = 0;
+	close_buffer(NULL, buf, DOBUF_WIPE, FALSE, FALSE, FALSE);
 	if (bufref_valid(&bufref))
 	    buf = nextbuf;	// didn't work, try next one
 	else

src/arglist.c

@@ -200,7 +200,7 @@ alist_add(
     if (check_arglist_locked() == FAIL)
 	return;
     arglist_locked = TRUE;
-    wp->w_locked = TRUE;
+    ++wp->w_locked;
 
 #ifdef BACKSLASH_IN_FILENAME
     slash_adjust(fname);
@@ -212,7 +212,7 @@ alist_add(
     ++al->al_ga.ga_len;
 
     arglist_locked = FALSE;
-    wp->w_locked = FALSE;
+    --wp->w_locked;
 }
 
 #if defined(BACKSLASH_IN_FILENAME)
@@ -373,7 +373,7 @@ alist_add_list(
 	    mch_memmove(&(ARGLIST[after + count]), &(ARGLIST[after]),
 				       (ARGCOUNT - after) * sizeof(aentry_T));
 	arglist_locked = TRUE;
-	wp->w_locked = TRUE;
+	++wp->w_locked;
 	for (i = 0; i < count; ++i)
 	{
 	    int flags = BLN_LISTED | (will_edit ? BLN_CURBUF : 0);
@@ -382,7 +382,7 @@ alist_add_list(
 	    ARGLIST[after + i].ae_fnum = buflist_add(files[i], flags);
 	}
 	arglist_locked = FALSE;
-	wp->w_locked = FALSE;
+	--wp->w_locked;
 	ALIST(wp)->al_ga.ga_len += count;
 	if (old_argcount > 0 && wp->w_arg_idx >= after)
 	    wp->w_arg_idx += count;

src/buffer.c

@@ -80,15 +80,14 @@ static garray_T buf_reuse = GA_EMPTY;	// file numbers to recycle
     static void
 trigger_undo_ftplugin(buf_T *buf, win_T *win)
 {
-    int win_was_locked = win->w_locked;
     window_layout_lock();
-    buf->b_locked++;
-    win->w_locked = TRUE;
+    ++buf->b_locked;
+    ++win->w_locked;
     // b:undo_ftplugin may be set, undo it
     do_cmdline_cmd((char_u*)"if exists('b:undo_ftplugin') | :legacy :exe \
 	    b:undo_ftplugin | endif");
-    buf->b_locked--;
-    win->w_locked = win_was_locked;
+    --buf->b_locked;
+    --win->w_locked;
     window_layout_unlock();
 }
 
@@ -227,7 +226,7 @@ open_buffer(
     {
 	// There MUST be a memfile, otherwise we can't do anything
 	// If we can't create one for the current buffer, take another buffer
-	close_buffer(NULL, curbuf, 0, FALSE, FALSE);
+	close_buffer(curwin, curbuf, 0, FALSE, FALSE, FALSE);
 	FOR_ALL_BUFFERS(curbuf)
 	    if (curbuf->b_ml.ml_mfp != NULL)
 		break;
@@ -545,36 +544,52 @@ can_unload_buffer(buf_T *buf)
  * DOBUF_DEL		buffer is unloaded and removed from buffer list
  * DOBUF_WIPE		buffer is unloaded and really deleted
  * DOBUF_WIPE_REUSE	idem, and add to buf_reuse list
- * When doing all but the first one on the current buffer, the caller should
- * get a new buffer very soon!
+ * When doing all but the first, the caller should get a new buffer very soon!
  *
  * The 'bufhidden' option can force freeing and deleting.
  *
+ * When "win" is not NULL and we reached the end and unloaded "buf", b_nwindows
+ * is decremented if w_buffer was "buf" after autocmds.  w_buffer is set to
+ * NULL in that case.  Otherwise, w_buffer->b_nwindows is not decremented;
+ * callers should decrement it if they still intend to switch "win"'s buffer or
+ * close "win"!  If "win" was initially curwin displaying "buf", it is
+ * re-entered if autocmds switched windows, if still open.
+ *
  * When "abort_if_last" is TRUE then do not close the buffer if autocommands
  * cause there to be only one window with this buffer.  e.g. when ":quit" is
  * supposed to close the window but autocommands close all other windows.
  *
  * When "ignore_abort" is TRUE don't abort even when aborting() returns TRUE.
  *
- * Return TRUE when we got to the end and b_nwindows was decremented.
+ * When "set_context" is TRUE, also call buflist_setfpos for "win" if it's
+ * showing "buf", and set b_last_cursor if "win" is the buffer's only window.
+ * Not done for closing popups.
+ *
+ * Return TRUE when we got to the end and unloaded "buf".
  */
     int
 close_buffer(
-    win_T	*win,		// if not NULL, set b_last_cursor
+    win_T	*win,
     buf_T	*buf,
     int		action,
     int		abort_if_last,
-    int		ignore_abort)
+    int		ignore_abort,
+    int		set_context)
 {
-    int		is_curbuf;
-    int		nwindows;
+    int		hiding_buf;
     bufref_T	bufref;
-    int		is_curwin = (curwin != NULL && curwin->w_buffer == buf);
-    win_T	*the_curwin = curwin;
+    int		is_curwin = (curwin != NULL && curwin == win
+				&& curwin->w_buffer == buf);
     tabpage_T	*the_curtab = curtab;
     int		unload_buf = (action != 0);
     int		wipe_buf = (action == DOBUF_WIPE || action == DOBUF_WIPE_REUSE);
     int		del_buf = (action == DOBUF_DEL || wipe_buf);
+    int		win_valid = win_valid_any_tab(win);
+    // win_valid is FALSE for closing popups, as they're first removed from the
+    // window list.  If so, skip some side-effects, but treat win as valid.
+    // Shouldn't be possible for autocmds to prematurely free win then, as it's
+    // not in the window list.
+    int		closed_popup = win && !win_valid && WIN_IS_POPUP(win);
 
     CHECK_CURBUF;
 
@@ -649,8 +664,7 @@ close_buffer(
     if ((del_buf || wipe_buf) && !can_unload_buffer(buf))
 	return FALSE;
 
-    // check no autocommands closed the window
-    if (win != NULL && win_valid_any_tab(win))
+    if (set_context && win_valid && win->w_buffer == buf)
     {
 	// Set b_last_cursor when closing the last window for the buffer.
 	// Remember the last cursor position and window options of the buffer.
@@ -666,7 +680,8 @@ close_buffer(
     set_bufref(&bufref, buf);
 
     // When the buffer is no longer in a window, trigger BufWinLeave
-    if (buf->b_nwindows == 1)
+    if ((win_valid || closed_popup) && win->w_buffer == buf
+	    && buf->b_nwindows == 1)
     {
 	++buf->b_locked;
 	++buf->b_locked_split;
@@ -707,85 +722,52 @@ aucmd_abort:
 	if (!ignore_abort && aborting())
 	    return FALSE;
 #endif
+	win_valid = win_valid && win_valid_any_tab(win);
     }
 
     // If the buffer was in curwin and the window has changed, go back to that
     // window, if it still exists.  This avoids that ":edit x" triggering a
     // "tabnext" BufUnload autocmd leaves a window behind without a buffer.
-    if (is_curwin && curwin != the_curwin && win_valid_any_tab(the_curwin))
+    if (is_curwin && curwin != win && win_valid)
     {
 	block_autocmds();
-	goto_tabpage_win(the_curtab, the_curwin);
+	goto_tabpage_win(the_curtab, win);
 	unblock_autocmds();
     }
 
-    nwindows = buf->b_nwindows;
-
-    // decrease the link count from windows (unless not in any window)
-    if (buf->b_nwindows > 0)
-	--buf->b_nwindows;
+    // Remember if the buffer may be hidden soon, or is already hidden.
+    hiding_buf = buf->b_nwindows <= 0 || ((win_valid || closed_popup)
+	    && win->w_buffer == buf && buf->b_nwindows == 1);
 
 #ifdef FEAT_DIFF
-    if (diffopt_hiddenoff() && !unload_buf && buf->b_nwindows == 0)
+    if (diffopt_hiddenoff() && !unload_buf && hiding_buf)
 	diff_buf_delete(buf);	// Clear 'diff' for hidden buffer.
 #endif
 
-    // Return when a window is displaying the buffer or when it's not
-    // unloaded.
-    if (buf->b_nwindows > 0 || !unload_buf)
+    // Return when another window is displaying the buffer or when not unloaded.
+    if (!hiding_buf || !unload_buf)
 	return FALSE;
 
     // Always remove the buffer when there is no file name.
     if (buf->b_ffname == NULL)
 	del_buf = TRUE;
 
-    // When closing the current buffer stop Visual mode before freeing
-    // anything.
-    if (buf == curbuf && VIsual_active
-#if defined(EXITFREE)
-	    && !entered_free_all_mem
-#endif
-	    )
-	end_visual_mode();
-
     // Free all things allocated for this buffer.
     // Also calls the "BufDelete" autocommands when del_buf is TRUE.
-    //
-    // Remember if we are closing the current buffer.  Restore the number of
-    // windows, so that autocommands in buf_freeall() don't get confused.
-    is_curbuf = (buf == curbuf);
-    buf->b_nwindows = nwindows;
-
-    buf_freeall(buf, (del_buf ? BFA_DEL : 0)
+    // Abort if nothing was freed, or if autocommands delete the buffer.
+    if (!buf_freeall(buf, (del_buf ? BFA_DEL : 0)
 		   + (wipe_buf ? BFA_WIPE : 0)
-		   + (ignore_abort ? BFA_IGNORE_ABORT : 0));
-
-    // Autocommands may have deleted the buffer.
-    if (!bufref_valid(&bufref))
-	return FALSE;
-#ifdef FEAT_EVAL
-    // autocmds may abort script processing
-    if (!ignore_abort && aborting())
-	return FALSE;
-#endif
-
-    // It's possible that autocommands change curbuf to the one being deleted.
-    // This might cause the previous curbuf to be deleted unexpectedly.  But
-    // in some cases it's OK to delete the curbuf, because a new one is
-    // obtained anyway.  Therefore only return if curbuf changed to the
-    // deleted buffer.
-    if (buf == curbuf && !is_curbuf)
+		   + (ignore_abort ? BFA_IGNORE_ABORT : 0)))
 	return FALSE;
 
-    if (win_valid_any_tab(win) && win->w_buffer == buf)
-	win->w_buffer = NULL;  // make sure we don't use the buffer now
-
-    // Autocommands may have opened or closed windows for this buffer.
-    // Decrement the count for the close we do here.
-    // Don't decrement b_nwindows if the buffer wasn't displayed in any window
-    // before calling buf_freeall().
-    if (nwindows > 0 && buf->b_nwindows > 0)
+    win_valid = win_valid && win_valid_any_tab(win);
+    if ((win_valid || closed_popup) && win->w_buffer == buf)
+    {
+	// Autocommands may have opened (despite b_locked_split) or closed
+	// windows for this buffer.  Decrement for the close we do here.
 	--buf->b_nwindows;
+	win->w_buffer = NULL;  // make sure we don't use the buffer now
+    }
 
     /*
      * Remove the buffer from the list.
@@ -848,6 +830,11 @@ aucmd_abort:
 	    buf->b_p_bl = FALSE;
     }
     // NOTE: at this point "curbuf" may be invalid!
+
+    // When closing curbuf for curwin, is_curwin checks should've ensured
+    // autocmds don't switch windows, unless they closed curwin.  Otherwise
+    // callers may leave the window open to a NULL buffer!
+    assert(!win_valid || !is_curwin || win == curwin);
     return TRUE;
 }
 
@@ -881,8 +868,10 @@ buf_clear_file(buf_T *buf)
  * BFA_WIPE	     buffer is going to be wiped out
  * BFA_KEEP_UNDO     do not free undo information
  * BFA_IGNORE_ABORT  don't abort even when aborting() returns TRUE
+ *
+ * Return TRUE when we got to the end.
  */
-    void
+    int
 buf_freeall(buf_T *buf, int flags)
 {
     int		is_curbuf = (buf == curbuf);
@@ -901,7 +890,7 @@ buf_freeall(buf_T *buf, int flags)
 								  FALSE, buf)
 		&& !bufref_valid(&bufref))
 	    // autocommands deleted the buffer
-	    return;
+	    return FALSE;
     }
     if ((flags & BFA_DEL) && buf->b_p_bl)
     {
@@ -909,7 +898,7 @@ buf_freeall(buf_T *buf, int flags)
 								   FALSE, buf)
 		&& !bufref_valid(&bufref))
 	    // autocommands deleted the buffer
-	    return;
+	    return FALSE;
     }
     if (flags & BFA_WIPE)
     {
@@ -917,7 +906,7 @@ buf_freeall(buf_T *buf, int flags)
 								  FALSE, buf)
 		&& !bufref_valid(&bufref))
 	    // autocommands deleted the buffer
-	    return;
+	    return FALSE;
     }
     --buf->b_locked;
     --buf->b_locked_split;
@@ -935,7 +924,7 @@ buf_freeall(buf_T *buf, int flags)
 #ifdef FEAT_EVAL
     // autocmds may abort script processing
     if ((flags & BFA_IGNORE_ABORT) == 0 && aborting())
-	return;
+	return FALSE;
 #endif
 
     // It's possible that autocommands change curbuf to the one being deleted.
@@ -943,7 +932,17 @@ buf_freeall(buf_T *buf, int flags)
     // it's OK to delete the curbuf, because a new one is obtained anyway.
     // Therefore only return if curbuf changed to the deleted buffer.
     if (buf == curbuf && !is_curbuf)
-	return;
+	return FALSE;
+
+    // If curbuf, stop Visual mode just before freeing, but after autocmds that
+    // may restart it.  May trigger TextYankPost, but with textlock set.
+    if (buf == curbuf && VIsual_active
+#if defined(EXITFREE)
+	    && !entered_free_all_mem
+#endif
+	    )
+	end_visual_mode();
+
 #ifdef FEAT_DIFF
     diff_buf_delete(buf);	    // Can't use 'diff' for unloaded buffer.
 #endif
@@ -981,6 +980,7 @@ buf_freeall(buf_T *buf, int flags)
     clear_buf_prop_types(buf);
 #endif
     buf->b_flags &= ~BF_READERR;    // a read error is no longer relevant
+    return TRUE;
 }
 
 /*
@@ -1229,11 +1229,11 @@ handle_swap_exists(bufref_T *old_curbuf)
 	// open a new, empty buffer.
 	swap_exists_action = SEA_NONE;	// don't want it again
 	swap_exists_did_quit = TRUE;
-	close_buffer(curwin, curbuf, DOBUF_UNLOAD, FALSE, FALSE);
+	close_buffer(curwin, curbuf, DOBUF_UNLOAD, FALSE, FALSE, TRUE);
 	if (old_curbuf == NULL || !bufref_valid(old_curbuf)
 					      || old_curbuf->br_buf == curbuf)
 	{
-	    // Block autocommands here because curwin->w_buffer is NULL.
+	    // Block autocommands here because curwin->w_buffer may be NULL.
 	    block_autocmds();
 	    buf = buflist_new(NULL, NULL, 1L, BLN_CURBUF | BLN_LISTED);
 	    unblock_autocmds();
@@ -1320,9 +1320,12 @@ empty_curbuf(
     // the old one.  But do_ecmd() may have done that already, check
     // if the buffer still exists.
     if (buf != curbuf && bufref_valid(&bufref) && buf->b_nwindows == 0)
-	close_buffer(NULL, buf, action, FALSE, FALSE);
+	close_buffer(NULL, buf, action, FALSE, FALSE, FALSE);
     if (!close_others)
 	need_fileinfo = FALSE;
+    else if (retval == OK && !shortmess(SHM_FILEINFO))
+	// do_ecmd() does not display file info for a new empty buffer.
+	need_fileinfo = TRUE;
     return retval;
 }
 
@@ -1545,7 +1548,7 @@ do_buffer_ext(
 	{
 	    close_windows(buf, FALSE);
 	    if (buf != curbuf && bufref_valid(&bufref) && buf->b_nwindows <= 0)
-		    close_buffer(NULL, buf, action, FALSE, FALSE);
+		    close_buffer(NULL, buf, action, FALSE, FALSE, FALSE);
 	    return OK;
 	}
 
@@ -1878,7 +1881,6 @@ set_curbuf(buf_T *buf, int action)
     bufref_T	newbufref;
     bufref_T	prevbufref;
     int		valid;
-    int		last_winid = get_last_winid();
 
     setpcmark();
     if ((cmdmod.cmod_flags & CMOD_KEEPALT) == 0)
@@ -1892,7 +1894,6 @@ set_curbuf(buf_T *buf, int action)
     prevbuf = curbuf;
     set_bufref(&prevbufref, prevbuf);
     set_bufref(&newbufref, buf);
-    int prev_nwindows = prevbuf->b_nwindows;
 
     // Autocommands may delete the current buffer and/or the buffer we want to
     // go to.  In those cases don't close the buffer.
@@ -1908,11 +1909,7 @@ set_curbuf(buf_T *buf, int action)
 	if (prevbuf == curwin->w_buffer)
 	    reset_synblock(curwin);
 #endif
-	// autocommands may have opened a new window
-	// with prevbuf, grr
-	if (unload ||
-		(prev_nwindows <= 1 && last_winid != get_last_winid()
-		 && action == DOBUF_GOTO && !buf_hide(prevbuf)))
+	if (unload)
 	    close_windows(prevbuf, FALSE);
 #if defined(FEAT_EVAL)
 	if (bufref_valid(&prevbufref) && !aborting())
@@ -1920,22 +1917,17 @@ set_curbuf(buf_T *buf, int action)
 	if (bufref_valid(&prevbufref))
 #endif
 	{
-	    win_T  *previouswin = curwin;
-
 	    // Do not sync when in Insert mode and the buffer is open in
 	    // another window, might be a timer doing something in another
 	    // window.
 	    if (prevbuf == curbuf
 		    && ((State & MODE_INSERT) == 0 || curbuf->b_nwindows <= 1))
 		u_sync(FALSE);
-	    close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf,
+	    close_buffer(curwin, prevbuf,
 		    unload ? action : (action == DOBUF_GOTO
 			&& !buf_hide(prevbuf)
 			&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0,
-		    FALSE, FALSE);
-	    if (curwin != previouswin && win_valid(previouswin))
-	      // autocommands changed curwin, Grr!
-	      curwin = previouswin;
+		    FALSE, FALSE, TRUE);
 	}
     }
     // An autocommand may have deleted "buf", already entered it (e.g., when
@@ -1948,10 +1940,6 @@ set_curbuf(buf_T *buf, int action)
 #endif
 	) || curwin->w_buffer == NULL)
     {
-	// autocommands changed curbuf and we will move to another
-	// buffer soon, so decrement curbuf->b_nwindows
-	if (curbuf != NULL && prevbuf != curbuf)
-	    curbuf->b_nwindows--;
 	// If the buffer is not valid but curwin->w_buffer is NULL we must
 	// enter some buffer.  Using the last one is hopefully OK.
 	if (!valid)
@@ -1973,7 +1961,9 @@ set_curbuf(buf_T *buf, int action)
     static void
 enter_buffer(buf_T *buf)
 {
-    // when closing the current buffer stop Visual mode
+    // Stop Visual mode before changing curbuf.  May trigger TextYankPost, but
+    // with textlock set.  Assumes curbuf and curwin->w_buffer is valid; if not,
+    // buf_freeall() should've done this already!
     if (VIsual_active
 #if defined(EXITFREE)
 	    && !entered_free_all_mem
@@ -1981,6 +1971,9 @@ enter_buffer(buf_T *buf)
 	    )
 	end_visual_mode();
 
+    if (curwin->w_buffer != NULL)
+	--curwin->w_buffer->b_nwindows;
+
     // Get the buffer in the current window.
     curwin->w_buffer = buf;
     curbuf = buf;
@@ -3659,7 +3652,7 @@ setfname(
 		return FAIL;
 	    }
 	    // delete from the list
-	    close_buffer(NULL, obuf, DOBUF_WIPE, FALSE, FALSE);
+	    close_buffer(NULL, obuf, DOBUF_WIPE, FALSE, FALSE, FALSE);
 	}
 	sfname = vim_strsave(sfname);
 	if (ffname == NULL || sfname == NULL)
@@ -6432,7 +6425,7 @@ wipe_buffer(
     if (!aucmd)		    // Don't trigger BufDelete autocommands here.
 	block_autocmds();
 
-    close_buffer(NULL, buf, DOBUF_WIPE, FALSE, TRUE);
+    close_buffer(NULL, buf, DOBUF_WIPE, FALSE, TRUE, FALSE);
 
     if (!aucmd)
 	unblock_autocmds();