patch 9.1.1543: Wayland: clipboard appears to not be working

Problem: Wayland: clipboard appears to not be working (Fuad Veliev) Solution: Explicitly set selection each time (Foxe Chen) fixes: #17732 closes: #17740 Signed-off-by: Foxe Chen <chen.foxe@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
patch 9.1.1542: Coverity complains about uninitialized variable
2025-07-14 21:54:23 +02:00 · 2025-07-14 21:46:46 +02:00 · 2025-07-14 21:27:34 +02:00 · 2025-07-13 17:53:26 +02:00 · 2025-07-13 17:01:57 +02:00 · 2025-07-13 16:53:53 +02:00
259 changed files with 17403 additions and 1610 deletions
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -510,6 +510,7 @@ runtime/syntax/hare.vim					@selenebun
 runtime/syntax/haredoc.vim				@selenebun
 runtime/syntax/haskell.vim				@coot
 runtime/syntax/hcl.vim					@gpanders
+runtime/syntax/help.vim					@dkearns
 runtime/syntax/help_ru.vim				@RestorerZ
 runtime/syntax/hgcommit.vim				@k-takata
 runtime/syntax/hitest.vim				@lacygoill
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,6 @@ src/xxd/xxd.dSYM
 *~
 *.pyc
 *.log
-src/po/vim.pot
 src/tags
 /tags
 /GPATH
--- a/.hgignore
+++ b/.hgignore
@@ -68,7 +68,6 @@ src/xxd/xxd.dSYM
 *~
 *.pyc
 *.log
-src/po/vim.pot
 src/tags
 /tags
 /GPATH
--- a/1
+++ b/1
@@ -1151,6 +1151,7 @@ LANG_SRC = \
 		src/po/sjiscorr.c \
 		src/po/big5corr.c \
 		src/po/*.po \
+		src/po/vim.pot \

 # The language files for the Win32 lang archive.
 LANG_DOS = \
--- a/lang/README.ru.txt
+++ b/lang/README.ru.txt
@@ -20,6 +20,11 @@ README.ru.txt для версии 9.1 программы Vim — Vi IMproved.
 функциональные клавиши клавиатуры необходимые команды, и использовать
 манипулятор «мышь».

+В редакторе Vim также обеспечивается (насколько это возможно) совместимость
+с POSIX-реализацией редактора vi, если он скомпилирован с минимальным набором
+функционала (обычно называемый vim.tiny). Данная сборка чаще всего используется
+во многих дистрибутивах Linux в качестве предустановленного редактора vi.
+
 Редактор Vim работает в ОС MS Windows (7, 8, 10, 11), macOS, Haiku, VMS и
 практически во всех UNIX-подобных системах.  А перенос на другие платформы не
 должен представлять особой сложности.
@@ -36,7 +41,7 @@ MS Windows 95/98/Me/NT/2000/XP/Vista, AmigaDOS, Atari MiNT, BeOS и RISC OS.
 возможностей.

 Существуют отдельные версии для Unix, PC, Amiga и некоторых других систем.
-Данный файл README.rux.txt поставляется вместе с архивом рабочих файлов
+Данный файл README.ru.txt поставляется вместе с архивом рабочих файлов
 программы.  Этот архив включает в себя документацию, файлы подсветки синтаксиса
 и другие файлы, которые используются редактором во время работы.  Чтобы
 запустить программу Vim, вы должны получить либо архив с исполняемыми файлами,
@@ -96,7 +101,7 @@ README_vms.txt		VMS
 Редактор Vim является благотворительным программным обеспечением.
 Использование и копирование программы Vim не ограничено, однако рекомендуется
 сделать добровольное пожертвование для нуждающихся детей в Уганде.  Чтобы узнать
-подробности, прочитайте, пожалуйста, файл "runtime/doc/uganda.rux" (введите
+подробности, прочитайте, пожалуйста, файл "runtime/doc/uganda.txt" (введите
 команду ":help uganda" в редакторе Vim).

 Краткое описание лицензии.
@@ -116,7 +121,7 @@ README_vms.txt		VMS
 над редактором Vim можно с помощью оказания финансовой поддержки.

 Пожертвованные вами деньги будут в основном направлены на оказание помощи детям
-Уганды, см. "runtime/doc/uganda.rux".  Однако в любом случае финансирование
+Уганды, см. "runtime/doc/uganda.txt".  Однако в любом случае финансирование
 будет способствовать повышению заинтересованности команды разработчиков
 в продолжении работы над редактором Vim!

--- a/runtime/autoload/dist/ft.vim
+++ b/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:		2025 Jul 08
+# Last Change:		2025 Jul 09
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>

 # These functions are moved here from runtime/filetype.vim to make startup
@@ -61,27 +61,30 @@ export def FTasmsyntax()
  var match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
  if match != ''
    b:asmsyntax = match
-  else
-    # Use heuristics
-    var is_slash_star_encountered = false
-    var i = 1
-    const n = min([50, line("$")])
-    while i <= n
-      const line = getline(i)
-      if line =~ '\%(^\|\n\)/\*'
-        is_slash_star_encountered = true
-      endif
-      if line =~# '^; Listing generated by Microsoft' || line =~? '\%(^\|\n\)\%(\%(CONST\|_BSS\|_DATA\|_TEXT\)\s\+SEGMENT\>\)\|\s*\.[2-6]86P\?\>\|\s*\.XMM\>'
-        b:asmsyntax = "masm"
-      elseif line =~ 'Texas Instruments Incorporated' || (line =~ '\%(^\|\n\)\*' && !is_slash_star_encountered)
-        # tiasm uses `* commment`, but detection is unreliable if '/*' is seen
-        b:asmsyntax = "tiasm"
-      elseif ((line =~? '\.title\>\|\.ident\>\|\.macro\>\|\.subtitle\>\|\.library\>'))
-        b:asmsyntax = "vmasm"
-      endif
-      i += 1
-    endwhile
+    return
  endif
+  # Use heuristics
+  var is_slash_star_encountered = false
+  var i = 1
+  const n = min([50, line("$")])
+  while i <= n
+    const line = getline(i)
+    if line =~ '^/\*'
+      is_slash_star_encountered = true
+    endif
+    if line =~# '^; Listing generated by Microsoft' || line =~? '^\%(\%(CONST\|_BSS\|_DATA\|_TEXT\)\s\+SEGMENT\>\)\|\s*\.[2-6]86P\?\>\|\s*\.XMM\>'
+      b:asmsyntax = "masm"
+      return
+    elseif line =~ 'Texas Instruments Incorporated' || (line =~ '^\*' && !is_slash_star_encountered)
+      # tiasm uses `* commment`, but detection is unreliable if '/*' is seen
+      b:asmsyntax = "tiasm"
+      return
+    elseif ((line =~? '\.title\>\|\.ident\>\|\.macro\>\|\.subtitle\>\|\.library\>'))
+      b:asmsyntax = "vmasm"
+      return
+    endif
+    i += 1
+  endwhile
 enddef

 var ft_visual_basic_content = '\c^\s*\%(Attribute\s\+VB_Name\|Begin\s\+\%(VB\.\|{\%(\x\+-\)\+\x\+}\)\)'
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.1.  Last change: 2025 Jul 06
+*builtin.txt*	For Vim version 9.1.  Last change: 2025 Jul 11


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -9378,11 +9378,12 @@ searchcount([{options}])					*searchcount()*

 		To get the last search count when |n| or |N| was pressed, call
 		this function with `recompute: 0` . This sometimes returns
-		wrong information because |n| and |N|'s maximum count is 99.
-		If it exceeded 99 the result must be max count + 1 (100). If
-		you want to get correct information, specify `recompute: 1`: >
+		wrong information because of 'maxsearchcount'.
+		If the count exceeded 'maxsearchcount', the result must be
+		'maxsearchcount' + 1. If you want to get correct information,
+		specify `recompute: 1`: >

-			" result == maxcount + 1 (100) when many matches
+			" result == 'maxsearchcount' + 1 when many matches
 			let result = searchcount(#{recompute: 0})

 			" Below returns correct result (recompute defaults
@@ -9469,7 +9470,7 @@ searchcount([{options}])					*searchcount()*
 						result.  if search exceeded
 						total count, "total" value
 						becomes `maxcount + 1`
-						(default: 99)
+						(default: 'maxsearchcount')
 		  pos		|List|		`[lnum, col, off]` value
 						when recomputing the result.
 						this changes "current" result
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.1.  Last change: 2025 Jun 28
+*eval.txt*	For Vim version 9.1.  Last change: 2025 Jul 13


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5210,7 +5210,7 @@ The |:Launch| user command uses shell completion for its first argument.

 NOTE: escaping of <args> is left to the user

-Examples: >vim
+Examples: >
 	vim9script

 	import autoload 'dist/vim9.vim'
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 9.1.  Last change: 2024 Dec 17
+*fold.txt*      For Vim version 9.1.  Last change: 2025 Jul 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -164,7 +164,7 @@ level is found.
 If this proves difficult, the next best thing could be to cache all fold
 levels in a buffer-local variable (b:foldlevels) that is only updated on
 |b:changedtick|:
->vim
+>
  vim9script
  def MyFoldFunc(): number
    if b:lasttick == b:changedtick
@@ -642,14 +642,17 @@ what you type!
 When using an operator, a closed fold is included as a whole.  Thus "dl"
 deletes the whole closed fold under the cursor.

-For Ex commands that work on buffer lines the range is adjusted to always
+For Ex commands that operate on buffer lines, the range is adjusted to always
 start at the first line of a closed fold and end at the last line of a closed
-fold.  Thus this command: >
+fold.  Thus, this command: >
 	:s/foo/bar/g
 when used with the cursor on a closed fold, will replace "foo" with "bar" in
 all lines of the fold.
 This does not happen for |:folddoopen| and |:folddoclosed|.

+Note that for some Ex commands like |:source| the range is only adjusted when
+using a two-address [range].
+
 When editing a buffer that has been edited before, the last used folding
 settings are used again.  For manual folding the defined folds are restored.
 For all folding methods the manually opened and closed folds are restored.
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2025 Jul 08
+*options.txt*	For Vim version 9.1.  Last change: 2025 Jul 10


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5898,6 +5898,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 	used.
 	Also see 'maxmem'.

+						*'maxsearchcount'* *'msc'*
+'maxsearchcount' 'msc'	number	(default 99)
+			global
+	Maximum number of matches shown for the search count status |shm-S|
+	When the number of matches exceeds this value, Vim shows ">" instead
+	of the exact count to keep searching fast.
+	Note: larger values may impact performance.
+	The value must be between 1 and 9999.
+
 						*'menuitems'* *'mis'*
 'menuitems' 'mis'	number	(default 25)
 			global
@@ -7669,7 +7678,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		is shown), the "search hit BOTTOM, continuing at TOP" and
 		"search hit TOP, continuing at BOTTOM" messages are only
 		indicated by a "W" (Mnemonic: Wrapped) letter before the
-		search count statistics.
+		search count statistics.  The maximum limit can be set with
+		the 'maxsearchcount' option.

 	This gives you the opportunity to avoid that a change between buffers
 	requires you to hit <Enter>, but still gives as useful a message as
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 9.1.  Last change: 2025 Jul 06
+*pattern.txt*   For Vim version 9.1.  Last change: 2025 Jul 10


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -189,6 +189,7 @@ The following options affect how a search is performed in Vim:
    'ignorecase'	ignore case when searching
    'imsearch'		use |IME| when entering the search pattern
    'incsearch'		show matches incrementally as the pattern is typed
+    'maxsearchcount'	maximum number for the search count |shm-S|
    'shortmess'		suppress messages |shm-s|; show search count |shm-S|
    'smartcase'		override 'ignorecase' if pattern contains uppercase
    'wrapscan'		continue searching from the start of the file
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 9.1.  Last change: 2024 Oct 16
+*repeat.txt*    For Vim version 9.1.  Last change: 2025 Jul 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -233,7 +233,12 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			Examples: >
 				:4,5source
 				:10,18source ++clear
-<
+
+<			Implementation detail: When sourcing a [range] of
+			lines that falls inside a folded region, the range
+			will be adjusted to the start and end of the fold,
+			but only if a two-address range was used.
+
 							*:source!*
 :so[urce]! {file}	Read Vim commands from {file}.  These are commands
 			that are executed from Normal mode, like you type
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -506,6 +506,7 @@ $quote	eval.txt	/*$quote*
 'maxmem'	options.txt	/*'maxmem'*
 'maxmempattern'	options.txt	/*'maxmempattern'*
 'maxmemtot'	options.txt	/*'maxmemtot'*
+'maxsearchcount'	options.txt	/*'maxsearchcount'*
 'mco'	options.txt	/*'mco'*
 'mef'	options.txt	/*'mef'*
 'menc'	options.txt	/*'menc'*
@@ -545,6 +546,7 @@ $quote	eval.txt	/*$quote*
 'mousetime'	options.txt	/*'mousetime'*
 'mp'	options.txt	/*'mp'*
 'mps'	options.txt	/*'mps'*
+'msc'	options.txt	/*'msc'*
 'msm'	options.txt	/*'msm'*
 'mzq'	options.txt	/*'mzq'*
 'mzquantum'	options.txt	/*'mzquantum'*
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 9.1.  Last change: 2025 Feb 22
+*terminal.txt*	For Vim version 9.1.  Last change: 2025 Jul 08


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1711,6 +1711,9 @@ than 99 will be displayed as "9+".

 If you want to customize the breakpoint signs to show `>>` in the signcolumn: >
 	let g:termdebug_config['sign'] = '>>'
+You can also specify individual signs for the first several breakpoints: >
+	let g:termdebug_config['signs'] = ['>1', '>2', '>3', '>4', '>5', '>6', '>7', '>8', '>9']
+	let g:termdebug_config['sign'] = '>>'
 If you would like to use decimal (base 10) breakpoint signs: >
 	let g:termdebug_config['sign_decimal'] = 1
 If the variable g:termdebug_config does not yet exist, you can use: >
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 9.1.  Last change: 2025 Jun 10
+*usr_25.txt*	For Vim version 9.1.  Last change: 2025 Jun 13

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -200,7 +200,7 @@ command: >vim

 Or put this line in your |vimrc|: >vim

-	packadd! justify
+	:packadd! justify

 This Vim script file defines a new visual command "_j".  To justify a block of
 text, highlight the text in Visual mode and then execute "_j".
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -1,4 +1,4 @@
-*version9.txt*  For Vim version 9.1.  Last change: 2025 Jul 08
+*version9.txt*  For Vim version 9.1.  Last change: 2025 Jul 10


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -41598,41 +41598,41 @@ Completion~

 Platform specific~
 -----------------
-Support for Wayland UI and support for the Wayland clipboard has been added.
+- Support for Wayland UI and support for the Wayland clipboard has been added.

-Support for the XDG Desktop Specification |xdg-base-dir| has been added and
-the environment variable |$MYVIMDIR| is set to the users personal runtime
-directory ($HOME/.vim or $HOME/.config/vim on Linux, $HOME/vimfiles on
-Windows).
+- Support for the XDG Desktop Specification |xdg-base-dir| has been added and
+  the environment variable |$MYVIMDIR| is set to the users personal runtime
+  directory ($HOME/.vim or $HOME/.config/vim on Linux, $HOME/vimfiles on
+  Windows).

-Python3 support in OpenVMS is now available.
+- Python3 support in OpenVMS is now available.

-The Win32 GUI comes with better toolbar icons.
+- The Win32 GUI comes with better toolbar icons.
 							*new-other-9.2*
 Other new features ~
 ------------------
-Support for Super key mappings in GTK using <D-Key>.
+- Support for Super key mappings in GTK using <D-Key>.

-The new packages |package-comment|, |package-nohlsearch|, |package-hlyank| and
-|help-TOC| are included.
+- The new packages |package-comment|, |package-nohlsearch|, |package-hlyank| and
+  |help-TOC| are included.

-An interactive tutor plugin has been included |vim-tutor-mode| and can be
-started via |:Tutor|.
+- An interactive tutor plugin has been included |vim-tutor-mode| and can be
+  started via |:Tutor|.

-Support for translating messages in Vim script plugins using the |gettext()|
-and |bindtextdomain()| functions was included.
+- Support for translating messages in Vim script plugins using the |gettext()|
+  and |bindtextdomain()| functions was included.

-Support highlighting the matched text and the completion kind for insert-mode
-completion and command-line completion in |ins-completion-menu|, see
-|complete-items|.
+- Support highlighting the matched text and the completion kind for
+  insert-mode completion and command-line completion in |ins-completion-menu|,
+  see |complete-items|.

-A new vertical |tabpanel| window has been included which is a vertical
-'tabline'.
+- A new vertical |tabpanel| window has been included which is a vertical
+  'tabline'.

-The |dist#vim9#Launch()| and |dist#vim9#Open()| functions have been added to
-the |vim-script-library| and decoupled from |netrw|.
+- The |dist#vim9#Launch()| and |dist#vim9#Open()| functions have been added to
+  the |vim-script-library| and decoupled from |netrw|.

-The new digraph "APPROACHES THE LIMIT" using ".=" has been added
+- The new digraph "APPROACHES THE LIMIT" using ".=" has been added.

 							*changed-9.2*
 Changed~
@@ -41798,7 +41798,8 @@ Options: ~
 'findfunc'		Vim function to obtain the results for a |:find|
 			command
 'isexpand'		defines triggers for completion
-'lhistory'		Size of the location list stack |quickfix-stack|.
+'lhistory'		Size of the location list stack |quickfix-stack|
+'maxsearchcount'	Set the maximum number for search-stat |shm-S|
 'messagesopt'		configure |:messages| and |hit-enter| prompt
 'pummaxwidth'		maximum width for the completion popup menu
 'showtabpanel'		When to show the |tabpanel|
@@ -41810,6 +41811,10 @@ Options: ~
 't_CF'			Support for alternate font highlighting terminal code
 'winfixbuf'		Keep buffer focused in a window

+Vim Arguments: ~
+|-Y|			Do not connect to the Wayland compositor.
+
+
 ==============================================================================
 INCOMPATIBLE CHANGES					*incompatible-9.2*

--- a/runtime/doc/vim-ru.1
+++ b/runtime/doc/vim-ru.1
@@ -1,4 +1,4 @@
-.TH VIM 1 "12 августа 2024"
+.TH VIM 1 "27 июня 2025"
 .SH НАЗНАЧЕНИЕ
 Программа Vim \[em] это Vi IMproved (Улучшенный Vi), текстовый редактор для
 программистов.
@@ -300,7 +300,7 @@ vim "+set si" main.c
 Работа без создания файла подкачки.
 В этом случае восстановление при сбое в работе редактора будет невозможно.
 Удобно для правки файла на очень медленном носителе (например, гибком диске).
-То же самое можно сделать командой ":set uc=0". Включение файла подкачки \[em] 
+То же самое можно сделать командой ":set uc=0". Включение файла подкачки \[em]
 ":set uc=200".
 .TP
 \-N
@@ -316,7 +316,7 @@ vim "+set si" main.c
 смотрите в документации.
 .TP
 \-o[N]
-Создать для N файлов отдельные окна, расположенные по горизонтали. 
+Создать для N файлов отдельные окна, расположенные по горизонтали.
 Если N не указано, то создаётся по одному окну на каждый файл.
 .TP
 \-O[N]
@@ -329,7 +329,7 @@ vim "+set si" main.c
 .TP
 \-P {заголовок окна}
 Открыть программу в многодокументном приложении.
-Только для ГИП в MS Windows. Задаёт заголовок окна родительского приложения. 
+Только для ГИП в MS Windows. Задаёт заголовок окна родительского приложения.
 Если возможно, то программа Vim будет запущена внутри окна многодокументного
 приложения. Многодокументное приложение должно иметь указанный {заголовок окна}.
 Убедитесь, что этот {заголовок окна} уникален для приложения. Обращаем внимание,
@@ -367,7 +367,7 @@ vim "+set si" main.c
 \-s {командный файл}
 Считывание команд режима команд из {командного файла}.
 Содержимое файла воспринимается в виде команд, как если бы они были набраны
-непосредственно в редакторе. 
+непосредственно в редакторе.
 То же самое достигается командой ":source! {командный файл}".
 Если после исполнения всех команд из {командного файла} работа редактора
 продолжается, то дальнейший ввод команд и текста ожидается с клавиатуры.
@@ -433,7 +433,7 @@ vim "+set si" main.c
 Добавление всех введённых команд в {файл}.
 Все символы, введённые с клавиатуры вплоть до момента завершения работы
 редактора, записываются в {файл}.
-Удобно в том случае, когда вы хотите создать командный файл для последующего 
+Удобно в том случае, когда вы хотите создать командный файл для последующего
 его использования в командной строке "vim \-s" или в команде ":source!".
 Если {файл} уже существует, то набранный текст будет добавляются в конец файла.
 .TP
@@ -453,12 +453,15 @@ vim "+set si" main.c
 Ускоряет загрузку в консоли, но делает невозможным использование заголовка окна
 и буфера обмена.
 .TP
+\-Y
+Запуск программы без подключения к Wayland Compositor.
+.TP
 \-y
 Работа в упрощённом варианте.
 Редактор
 .B Vim
 будет работать в упрощённом варианте, как будто исполняемый файл имеет название
-"evim" или "eview". 
+"evim" или "eview".
 Поведение редактора
 .B Vim
 будет походить на редакторы, созданные по безрежимному принципу работы.
@@ -542,7 +545,7 @@ vim "+set si" main.c
 .TP
 \-\-remote\-expr {выражение}
 Будет выполнено подключение к Vim-серверу и передача указанного {выражение} для
-вычисления. 
+вычисления.
 Результат вычисления будет выведен в поток стандартного вывода (stdout).
 .TP
 \-\-remote\-send {код клавиши}
@@ -562,8 +565,8 @@ vim "+set si" main.c
 Будет выведен перечень всех доступных Vim-серверов.
 .TP
 \-\-servername {название}
-Использовать указанное {название} в качестве наименования сервера. Если аргумент 
-"\-\-remote" не указан, то {название} присваивается данной копии редактора Vim, 
+Использовать указанное {название} в качестве наименования сервера. Если аргумент
+"\-\-remote" не указан, то {название} присваивается данной копии редактора Vim,
 в противном случае указывает на сервер, к которому следует подключиться.
 .TP
 \-\-socketid {id}
@@ -591,8 +594,8 @@ vim "+set si" main.c
 Например, по команде ":help ZZ" будет выведена информация о команде "ZZ".
 Используйте клавиши <TAB> и CTRL+D для подстановки нужного названия темы
 (см. ":help cmdline\-completion").
-Для быстрого перемещения по документации используются индексы (что-то 
-вроде гипертекстовых ссылок, см. ":help"). Таким образом можно 
+Для быстрого перемещения по документации используются индексы (что-то
+вроде гипертекстовых ссылок, см. ":help"). Таким образом можно
 переходить от одного файла документации к другому, например, ":help syntax.txt".
 .SH ФАЙЛЫ
 .TP 15
@@ -635,7 +638,7 @@ vim "+set si" main.c
 (будет использован первый найденный файл из указанных).
 .TP
 /usr/local/share/vim/vim??/optwin.vim
-Командный файл, используемый при выполнении команды ":options". 
+Командный файл, используемый при выполнении команды ":options".
 По этой команде предоставляется удобный способ просмотра и изменения настроек.
 .TP
 /usr/local/share/vim/vim??/menu.vim
@@ -664,20 +667,20 @@ vimtutor(1)
 .SH АВТОРЫ
 Большая часть редактора
 .B Vim
-была создана Брамом Моленаром (Bram Moolenaar), которому помогало огромное 
+была создана Брамом Моленаром (Bram Moolenaar), которому помогало огромное
 количество людей. См. ":help credits" в редакторе
 .B Vim.
 .br
 Редактор
 .B Vim
 базируется на коде редактора Stevie, написанного Тимом Томпсоном (Tim Thompson),
-Тони Эндрюсом (Tony Andrews) и Г. Р. (Фредом) Уолтером (G.R. (Fred) Walter). 
+Тони Эндрюсом (Tony Andrews) и Г. Р. (Фредом) Уолтером (G.R. (Fred) Walter).
 Однако, в настоящее время в программе Vim почти ничего не осталось
 от исторического кода его предшественника.
 .br
 Русская локализация редактора
-.B Vim 
-выполняется в рамках проекта "РуВим", 
+.B Vim
+выполняется в рамках проекта "РуВим",
 см. <URL:https://github.com/restorerz/ruvim/>.
 .SH ОШИБКИ
 Скорее всего есть.
@@ -685,7 +688,7 @@ vimtutor(1)
 .PP
 Заметим, что многие вещи, которые считаются ошибками, на самом деле
 являются результатом слишком полного воспроизведения поведения редактора Vi.
-Если вы думаете, что что-то является ошибкой только потому, что 
-"Vi делает это по-другому", внимательно прочитайте файл vi_diff.txt 
+Если вы думаете, что что-то является ошибкой только потому, что
+"Vi делает это по-другому", внимательно прочитайте файл vi_diff.txt
 (или наберите ":help vi_diff.txt" в редакторе Vim) и посмотрите параметры
 'compatible' и 'cpoptions'.
--- a/runtime/doc/vim-ru.UTF-8.1
+++ b/runtime/doc/vim-ru.UTF-8.1
@@ -1,4 +1,4 @@
-.TH VIM 1 "12 августа 2024"
+.TH VIM 1 "27 июня 2025"
 .SH НАЗНАЧЕНИЕ
 Программа Vim \[em] это Vi IMproved (Улучшенный Vi), текстовый редактор для
 программистов.
@@ -300,7 +300,7 @@ vim "+set si" main.c
 Работа без создания файла подкачки.
 В этом случае восстановление при сбое в работе редактора будет невозможно.
 Удобно для правки файла на очень медленном носителе (например, гибком диске).
-То же самое можно сделать командой ":set uc=0". Включение файла подкачки \[em] 
+То же самое можно сделать командой ":set uc=0". Включение файла подкачки \[em]
 ":set uc=200".
 .TP
 \-N
@@ -316,7 +316,7 @@ vim "+set si" main.c
 смотрите в документации.
 .TP
 \-o[N]
-Создать для N файлов отдельные окна, расположенные по горизонтали. 
+Создать для N файлов отдельные окна, расположенные по горизонтали.
 Если N не указано, то создаётся по одному окну на каждый файл.
 .TP
 \-O[N]
@@ -329,7 +329,7 @@ vim "+set si" main.c
 .TP
 \-P {заголовок окна}
 Открыть программу в многодокументном приложении.
-Только для ГИП в MS Windows. Задаёт заголовок окна родительского приложения. 
+Только для ГИП в MS Windows. Задаёт заголовок окна родительского приложения.
 Если возможно, то программа Vim будет запущена внутри окна многодокументного
 приложения. Многодокументное приложение должно иметь указанный {заголовок окна}.
 Убедитесь, что этот {заголовок окна} уникален для приложения. Обращаем внимание,
@@ -367,7 +367,7 @@ vim "+set si" main.c
 \-s {командный файл}
 Считывание команд режима команд из {командного файла}.
 Содержимое файла воспринимается в виде команд, как если бы они были набраны
-непосредственно в редакторе. 
+непосредственно в редакторе.
 То же самое достигается командой ":source! {командный файл}".
 Если после исполнения всех команд из {командного файла} работа редактора
 продолжается, то дальнейший ввод команд и текста ожидается с клавиатуры.
@@ -433,7 +433,7 @@ vim "+set si" main.c
 Добавление всех введённых команд в {файл}.
 Все символы, введённые с клавиатуры вплоть до момента завершения работы
 редактора, записываются в {файл}.
-Удобно в том случае, когда вы хотите создать командный файл для последующего 
+Удобно в том случае, когда вы хотите создать командный файл для последующего
 его использования в командной строке "vim \-s" или в команде ":source!".
 Если {файл} уже существует, то набранный текст будет добавляются в конец файла.
 .TP
@@ -453,12 +453,15 @@ vim "+set si" main.c
 Ускоряет загрузку в консоли, но делает невозможным использование заголовка окна
 и буфера обмена.
 .TP
+\-Y
+Запуск программы без подключения к Wayland Compositor.
+.TP
 \-y
 Работа в упрощённом варианте.
 Редактор
 .B Vim
 будет работать в упрощённом варианте, как будто исполняемый файл имеет название
-"evim" или "eview". 
+"evim" или "eview".
 Поведение редактора
 .B Vim
 будет походить на редакторы, созданные по безрежимному принципу работы.
@@ -542,7 +545,7 @@ vim "+set si" main.c
 .TP
 \-\-remote\-expr {выражение}
 Будет выполнено подключение к Vim-серверу и передача указанного {выражение} для
-вычисления. 
+вычисления.
 Результат вычисления будет выведен в поток стандартного вывода (stdout).
 .TP
 \-\-remote\-send {код клавиши}
@@ -562,8 +565,8 @@ vim "+set si" main.c
 Будет выведен перечень всех доступных Vim-серверов.
 .TP
 \-\-servername {название}
-Использовать указанное {название} в качестве наименования сервера. Если аргумент 
-"\-\-remote" не указан, то {название} присваивается данной копии редактора Vim, 
+Использовать указанное {название} в качестве наименования сервера. Если аргумент
+"\-\-remote" не указан, то {название} присваивается данной копии редактора Vim,
 в противном случае указывает на сервер, к которому следует подключиться.
 .TP
 \-\-socketid {id}
@@ -591,8 +594,8 @@ vim "+set si" main.c
 Например, по команде ":help ZZ" будет выведена информация о команде "ZZ".
 Используйте клавиши <TAB> и CTRL+D для подстановки нужного названия темы
 (см. ":help cmdline\-completion").
-Для быстрого перемещения по документации используются индексы (что-то 
-вроде гипертекстовых ссылок, см. ":help"). Таким образом можно 
+Для быстрого перемещения по документации используются индексы (что-то
+вроде гипертекстовых ссылок, см. ":help"). Таким образом можно
 переходить от одного файла документации к другому, например, ":help syntax.txt".
 .SH ФАЙЛЫ
 .TP 15
@@ -635,7 +638,7 @@ vim "+set si" main.c
 (будет использован первый найденный файл из указанных).
 .TP
 /usr/local/share/vim/vim??/optwin.vim
-Командный файл, используемый при выполнении команды ":options". 
+Командный файл, используемый при выполнении команды ":options".
 По этой команде предоставляется удобный способ просмотра и изменения настроек.
 .TP
 /usr/local/share/vim/vim??/menu.vim
@@ -664,20 +667,20 @@ vimtutor(1)
 .SH АВТОРЫ
 Большая часть редактора
 .B Vim
-была создана Брамом Моленаром (Bram Moolenaar), которому помогало огромное 
+была создана Брамом Моленаром (Bram Moolenaar), которому помогало огромное
 количество людей. См. ":help credits" в редакторе
 .B Vim.
 .br
 Редактор
 .B Vim
 базируется на коде редактора Stevie, написанного Тимом Томпсоном (Tim Thompson),
-Тони Эндрюсом (Tony Andrews) и Г. Р. (Фредом) Уолтером (G.R. (Fred) Walter). 
+Тони Эндрюсом (Tony Andrews) и Г. Р. (Фредом) Уолтером (G.R. (Fred) Walter).
 Однако, в настоящее время в программе Vim почти ничего не осталось
 от исторического кода его предшественника.
 .br
 Русская локализация редактора
-.B Vim 
-выполняется в рамках проекта "РуВим", 
+.B Vim
+выполняется в рамках проекта "РуВим",
 см. <URL:https://github.com/restorerz/ruvim/>.
 .SH ОШИБКИ
 Скорее всего есть.
@@ -685,7 +688,7 @@ vimtutor(1)
 .PP
 Заметим, что многие вещи, которые считаются ошибками, на самом деле
 являются результатом слишком полного воспроизведения поведения редактора Vi.
-Если вы думаете, что что-то является ошибкой только потому, что 
-"Vi делает это по-другому", внимательно прочитайте файл vi_diff.txt 
+Если вы думаете, что что-то является ошибкой только потому, что
+"Vi делает это по-другому", внимательно прочитайте файл vi_diff.txt
 (или наберите ":help vi_diff.txt" в редакторе Vim) и посмотрите параметры
 'compatible' и 'cpoptions'.
--- a/runtime/doc/vimtutor-ru.1
+++ b/runtime/doc/vimtutor-ru.1
@@ -17,7 +17,7 @@
 .PP
 Практический курс, который будет открыт по команде
 .B vimtutor
-полезен для новичков, желающих научиться самым основным командам редактора
+, полезен для новичков, желающих научиться самым основным командам редактора
 .B Vim.
 .PP
 Необязательный аргумент [ISO639] задаётся как двух- или трёхсимвольный код языка,
@@ -30,7 +30,7 @@
 .PP
 При работе с учебником, редактор
 .B Vim
-всегда запускается в режиме совместимости с редактором
+всегда запускается в варианте неполной совместимости с редактором
 .B Vi.
 .SH АРГУМЕНТЫ КОМАНДНОЙ СТРОКИ
 .TP
--- a/runtime/doc/vimtutor-ru.UTF-8.1
+++ b/runtime/doc/vimtutor-ru.UTF-8.1
@@ -17,7 +17,7 @@
 .PP
 Практический курс, который будет открыт по команде
 .B vimtutor
-полезен для новичков, желающих научиться самым основным командам редактора
+, полезен для новичков, желающих научиться самым основным командам редактора
 .B Vim.
 .PP
 Необязательный аргумент [ISO639] задаётся как двух- или трёхсимвольный код языка,
@@ -30,7 +30,7 @@
 .PP
 При работе с учебником, редактор
 .B Vim
-всегда запускается в режиме совместимости с редактором
+всегда запускается в варианте неполной совместимости с редактором
 .B Vi.
 .SH АРГУМЕНТЫ КОМАНДНОЙ СТРОКИ
 .TP
--- a/runtime/ftplugin/haskell.vim
+++ b/runtime/ftplugin/haskell.vim
@@ -3,6 +3,7 @@
 " Maintainer:           Daniel Campoverde <alx@sillybytes.net>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2018-08-27
+" 2025 Jul 09 by Vim Project revert setting iskeyword #8191

 if exists("b:did_ftplugin")
  finish
@@ -17,7 +18,6 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s
 setlocal formatoptions-=t formatoptions+=croql
 setlocal omnifunc=haskellcomplete#Complete
-setlocal iskeyword+='

 let &cpo = s:cpo_save
 unlet s:cpo_save
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2025 Jul 05
+" Last Change:	2025 Jul 10
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>

 " If there already is an option window, jump to that one.
@@ -283,6 +283,8 @@ call <SID>AddOption("ignorecase", gettext("ignore case when using a search patte
 call <SID>BinOptionG("ic", &ic)
 call <SID>AddOption("smartcase", gettext("override 'ignorecase' when pattern has upper case characters"))
 call <SID>BinOptionG("scs", &scs)
+call <SID>AddOption("maxsearchcount", gettext("maximum number for the search count feature"))
+call <SID>OptionG("msc", &msc)
 call <SID>AddOption("casemap", gettext("what method to use for changing case of letters"))
 call <SID>OptionG("cmp", &cmp)
 call <SID>AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching"))
--- a/runtime/pack/dist/opt/helptoc/autoload/helptoc.vim
+++ b/runtime/pack/dist/opt/helptoc/autoload/helptoc.vim
@@ -1,4 +1,10 @@
 vim9script noclear
+
+# the Vim HelpTOC plugin, creates a table of contents in a popup
+# Maintainer: Vim project
+# Original Author: @lacygoill
+# Latest Change: 2025 Jul 10
+#
 # Config {{{1
 # g:helptoc {{{2
 # Create the g:helptoc dict (used to specify the shell_prompt and other
@@ -503,6 +509,7 @@ def SetToc() #{{{2
            l[0]->str2nr() - ll[0]->str2nr())

    var skip_next: bool = false
+    var skip_fence: bool = false

    # Non-help headings processing
    for lnum: number in range(1, line('$'))
@@ -516,6 +523,16 @@ def SetToc() #{{{2

        # Special handling for markdown filetype using setext headings
        if g:helptoc.type == 'markdown'
+            # ignore fenced codeblock lines
+            if curline =~ '^```.'
+                skip_fence = true
+            elseif curline =~ '^```$'
+                skip_fence = !skip_fence
+            endif
+            if skip_fence
+                curline = nextline
+                continue
+            endif
            # Check for setext formatted headings (= or - underlined)
            if nextline =~ '^\s\{0,3}=\+$' && curline =~ '\S'
                # Level 1 heading (one or more =, up to three spaces preceding)
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -4,7 +4,7 @@ vim9script

 # Author: Bram Moolenaar
 # Copyright: Vim license applies, see ":help license"
-# Last Change: 2024 Nov 19
+# Last Change: 2025 Jul 08
 # Converted to Vim9: Ubaldo Tiberi <ubaldo.tiberi@gmail.com>

 # WORK IN PROGRESS - The basics works stable, more to come
@@ -1917,14 +1917,21 @@ def CreateBreakpoint(id: number, subid: number, enabled: string)
      hiName = "debugBreakpoint"
    endif
    var label = ''
-    if exists('g:termdebug_config') && has_key(g:termdebug_config, 'sign')
-      label = g:termdebug_config['sign']
-    elseif exists('g:termdebug_config') && has_key(g:termdebug_config, 'sign_decimal')
-      label = printf('%02d', id)
-      if id > 99
-        label = '9+'
+    if exists('g:termdebug_config')
+      if has_key(g:termdebug_config, 'signs')
+        label = get(g:termdebug_config.signs, id - 1, '')
      endif
-    else
+      if label == '' && has_key(g:termdebug_config, 'sign')
+        label = g:termdebug_config['sign']
+      endif
+      if label == '' && has_key(g:termdebug_config, 'sign_decimal')
+        label = printf('%02d', id)
+        if id > 99
+          label = '9+'
+        endif
+      endif
+    endif
+    if label == ''
      label = printf('%02X', id)
      if id > 255
        label = 'F+'
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -2,7 +2,7 @@
 " Language:	   Vim script
 " Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2025 Jul 05
+" Last Change:	   2025 Jul 11
 " Former Maintainer: Charles E. Campbell

 " DO NOT CHANGE DIRECTLY.
@@ -232,10 +232,10 @@ syn case match
 " All vimCommands are contained by vimIsCommand. {{{2
 syn cluster vimCmdList	contains=vimAbb,vimAddress,vimAutocmd,vimAugroup,vimBehave,vimCall,vimCatch,vimCommandModifier,vimConst,vimDoautocmd,vimDebuggreedy,vimDef,vimDefFold,vimDelcommand,vimDelFunction,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimImport,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSynColor,vimSynLink,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl
 syn cluster vim9CmdList	contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
-syn match vimCmdSep	"\\\@1<!|"	skipwhite nextgroup=@vimCmdList,vimSubst1,vimFunc
+syn match vimCmdSep	"\\\@1<!|"	skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
 syn match vimCmdSep	":\+"	skipwhite nextgroup=@vimCmdList,vimSubst1
 syn match vimCount	contained	"\d\+"
-syn match vimIsCommand	"\<\%(\h\w*\|[23]mat\%[ch]\)\>"	 nextgroup=vimBang contains=vimCommand
+syn match vimIsCommand	"\<\h\w*\>"	nextgroup=vimBang contains=vimCommand
 syn match vimBang	      contained	"!"
 syn match vimWhitespace contained	"\s\+"

@@ -268,7 +268,7 @@ Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+\.\.="			contains=vimVar,@

 Vim9 syn match vim9LhsRegister	"@["0-9\-a-zA-Z#=*+_/]\ze\s\+\%(\.\.\)\=="

-syn cluster vimExprList	contains=@vimSpecialVar,vimFunc,vimNumber,vimOper,vimOperParen,vimLambda,vimString,vimVar,@vim9ExprList
+syn cluster vimExprList	contains=@vimSpecialVar,@vimFunc,vimNumber,vimOper,vimOperParen,vimLambda,vimString,vimVar,@vim9ExprList
 syn cluster vim9ExprList	contains=vim9Boolean,vim9LambdaParams,vim9Null

 " Insertions And Appends: insert append {{{2
@@ -291,7 +291,7 @@ syn keyword vimBehaveModel	contained	mswin	xterm

 " Call {{{2
 " ====
-syn match vimCall	"\<call\=\>"	skipwhite nextgroup=vimFunc
+syn match vimCall	"\<call\=\>"	skipwhite nextgroup=@vimFunc

 " Debuggreedy {{{2
 " ===========
@@ -361,7 +361,7 @@ syn match	vimImport		"\<imp\%[ort]\>"		skipwhite nextgroup=vimImportAutoload,vim

 " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
 " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
-syn cluster vimAugroupList	contains=@vimCmdList,vimFilter,vimFunc,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,@vimComment,vimString,vimSubst,vimRegister,vimCmplxRepeat,vimNotation,vimCtrlChar,vimContinue
+syn cluster vimAugroupList	contains=@vimCmdList,vimFilter,@vimFunc,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,@vimComment,vimString,vimSubst,vimRegister,vimCmplxRepeat,vimNotation,vimCtrlChar,vimContinue

 " define
 VimFolda syn region vimAugroup
@@ -436,9 +436,9 @@ syn match	vim9LambdaOperatorComment contained "#.*" skipwhite skipempty nextgrou

 " Functions: Tag is provided for those who wish to highlight tagged functions {{{2
 " =========
-syn cluster	vimFunctionBodyCommon	contains=@vimCmdList,vimCmplxRepeat,vimContinue,vimCtrlChar,vimDef,vimFBVar,vimFunc,vimFunction,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegister,vimSpecFile,vimString,vimSubst,vimFunctionFold,vimDefFold,vimCmdSep
+syn cluster	vimFunctionBodyCommon	contains=@vimCmdList,vimCmplxRepeat,vimContinue,vimCtrlChar,vimDef,vimFBVar,vimFunction,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegister,vimSpecFile,vimString,vimSubst,vimFunctionFold,vimDefFold,vimCmdSep
 syn cluster	vimFunctionBodyList	contains=@vimFunctionBodyCommon,vimComment,vimLineComment,vimInsert,vimConst,vimLet,vimSearch
-syn cluster	vimDefBodyList		contains=@vimFunctionBodyCommon,vim9Comment,vim9LineComment,vim9Block,vim9Const,vim9Final,vim9Var,vim9Null,vim9Boolean,vim9For,vim9LhsVariable,vim9LhsVariableList,vim9LhsRegister,vim9Search,@vimSpecialVar
+syn cluster	vimDefBodyList		contains=@vimFunctionBodyCommon,vim9Comment,vim9LineComment,vim9Block,vim9Const,vim9Final,vim9Var,vim9Null,vim9Boolean,vim9For,vim9LhsVariable,vim9LhsVariableList,vim9LhsRegister,vim9Search,@vimSpecialVar,@vim9Func

 syn region	vimFunctionPattern	contained
      \ matchgroup=vimOper
@@ -751,7 +751,7 @@ syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained

 " User-Specified Commands: {{{2
 " =======================
-syn cluster	vimUserCmdList	contains=@vimCmdList,vimCmplxRepeat,@vimComment,vimCtrlChar,vimEscapeBrace,vimFunc,vimNotation,vimNumber,vimOper,vimRegister,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange
+syn cluster	vimUserCmdList	contains=@vimCmdList,vimCmplxRepeat,@vimComment,vimCtrlChar,vimEscapeBrace,@vimFunc,vimNotation,vimNumber,vimOper,vimRegister,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange

 syn match	vimUserCmd	"\<com\%[mand]\>!\="		skipwhite        nextgroup=vimUserCmdAttrs,vimUserCmdName contains=vimBang
 syn match	vimUserCmd	+\<com\%[mand]\>!\=\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimUserCmdAttrs,vimUserCmdName contains=vimBang
@@ -975,7 +975,7 @@ syn match	vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
 " Set command and associated set-options (vimOptions) with comment {{{2
 syn match	vimSet		"\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skipwhite nextgroup=vimSetBang,vimCmdSep,vimComment,vimSetArgs
 syn region	vimSetComment	contained	start=+"+ skip=+\n\s*\%(\\\||"\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString extend
-syn match	vimSetCmdSep	contained	"|" skipwhite nextgroup=@vimCmdList,vimSubst1,vimFunc
+syn match	vimSetCmdSep	contained	"|" skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
 syn match	vimSetEscape	contained	"\\\%(\\[|"]\|.\)"
 syn match	vimSetBarEscape	contained	"\\|"
 syn match	vimSetQuoteEscape	contained	+\\"+
@@ -1183,9 +1183,9 @@ syn region	vimAutocmdPattern	contained
      \ skip="\\\\\|\\[,[:space:]]"
      \ end="\ze[,[:space:]]"
      \ end="$"
-      \ skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock
+      \ skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock,@vimFunc
      \ contains=vimEnvvar,@vimWildcard,vimAutocmdPatternEscape
-syn match	vimAutocmdBufferPattern	contained	"<buffer\%(=\%(\d\+\|abuf\)\)\=>" skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock
+syn match	vimAutocmdBufferPattern	contained	"<buffer\%(=\%(\d\+\|abuf\)\)\=>" skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock,@vimFunc
 " trailing pattern separator comma allowed
 syn match	vimAutocmdPatternSep	contained	","	                skipwhite nextgroup=@vimAutocmdPattern,vimAutocmdMod,vimAutocmdBlock
 syn match	vimAutocmdPatternEscape	contained	"\\."
@@ -1377,6 +1377,12 @@ syn region	vimMenutranslate
 syn match	vimMenutranslateName "\%(\\\s\|\S\)\+" contained contains=vimMenuNotation,vimNotation
 syn match	vimMenutranslateComment +".*+ contained containedin=vimMenutranslate

+" If, While and Return: {{{2
+" ====================
+syn match	vimNotFunc	"\%#=1\<\%(if\|el\%[seif]\|retu\%[rn]\|while\)\>"	skipwhite nextgroup=@vimExprList,vimNotation
+syn match	vimElse	"\<el\%[se]\>"			skipwhite nextgroup=vimComment,vim9Comment
+syn match	vimEndif	"\<en\%[dif]\>"			skipwhite nextgroup=vimComment,vim9Comment
+
 " Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
 " ======================
 syn case ignore
@@ -1400,17 +1406,8 @@ syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}char-\%
 syn match	vimBracket contained	"[\\<>]"
 syn case match

-" User Function Highlighting: {{{2
-" (following Gautam Iyer's suggestion)
-" ==========================
-syn match	vimFunc              	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("                	skipwhite nextgroup=vimOperParen contains=vimFuncEcho,vimFuncName,vimUserFunc,vimExecute
-syn match	vimUserFunc	contained        	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation,vim9MethodName,vim9Super,vim9This
-syn keyword	vimFuncEcho	contained      	ec ech echo
-
-syn match	vimMap	"\<map\%(\s\+(\)\@="	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-
 " User Command Highlighting: {{{2
-syn match vimUsrCmd	'^\s*\zs\u\%(\w*\)\@>\%([(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'
+syn match vimUsrCmd	'^\s*\zs\u\%(\w*\)\@>\%([.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'

 " Vim user commands

@@ -1440,20 +1437,20 @@ if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
 syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
 endif

-" If, While and Return: {{{2
-" ====================
-syn match	vimNotFunc	"\%#=1\<\%(if\|el\%[seif]\|retu\%[rn]\|while\)\>"	skipwhite nextgroup=@vimExprList,vimNotation
-syn match	vimElse	"\<el\%[se]\>"			skipwhite nextgroup=vimComment,vim9Comment
-syn match	vimEndif	"\<en\%[dif]\>"			skipwhite nextgroup=vimComment,vim9Comment
-
 " Match: {{{2
 " =====
-syn match	vimMatch		"\<[23]\=mat\%[ch]\>" skipwhite nextgroup=vimMatchGroup,vimMatchNone
-syn match	vimMatchGroup	contained	"[[:alnum:]._-]\+"    skipwhite nextgroup=vimMatchPattern
+syn match	vimMatch		"\<\%([1-3]\s*\)\=mat\%[ch]\>"	skipwhite nextgroup=vimMatchGroup,vimMatchNone contains=vimCount
+syn match	vimMatchGroup	contained	"[[:alnum:]._-]\+"	skipwhite nextgroup=vimMatchPattern
 syn case ignore
 syn keyword	vimMatchNone	contained	none
 syn case match
-syn region	vimMatchPattern	contained	matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@vimSubstList oneline
+syn region	vimMatchPattern	contained
+      \ matchgroup=Delimiter
+      \ start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ contains=@vimSubstList
+      \ oneline

 " Normal: {{{2
 " ======
@@ -2064,6 +2061,20 @@ VimFoldt syn region vimTclHeredoc	contained
      \ contains=@vimTclScript

 unlet s:interfaces
+" Function Call Highlighting: {{{2
+" (following Gautam Iyer's suggestion)
+" ==========================
+syn match	vimFunc	contained	"\<\l\w*\ze\s*("				skipwhite nextgroup=vimOperParen contains=vimFuncName
+syn match	vimUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\s*("		skipwhite nextgroup=vimOperParen contains=vim9MethodName,vim9Super,vim9This
+syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\s*("		skipwhite nextgroup=vimOperParen contains=vimVarScope
+syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\s*("	skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation
+
+Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze("		skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
+Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze("				skipwhite nextgroup=vimOperParen contains=vimFuncName
+
+syn cluster	vimFunc	contains=vimFunc,vimUserFunc
+syn cluster	vim9Func	contains=vim9Func,vim9UserFunc
+
 " Beginners - Patterns that involve ^ {{{2
 " =========
 Vim9 syn region	vim9LineComment	start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\\\|\n\s*#\\ + end="$" contains=@vimCommentGroup,vimCommentString,vim9CommentTitle extend
@@ -2132,6 +2143,7 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimFTError	vimError
  hi def link vimFunctionError	vimError
  hi def link vimFunc         	vimError
+  hi def link vim9Func         	vimError
  hi def link vimHiAttribList	vimError
  hi def link vimHiCtermError	vimError
  hi def link vimHiKeyError	vimError
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
-" Language:	Vim help file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2024 Dec 25
+" Language:		Vim help file
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Last Change:		2025 Jul 12
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>

 " Quit when a (custom) syntax file was already loaded
@@ -12,6 +12,8 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim

+syn iskeyword @,48-57,_,192-255
+
 if !exists('g:help_example_languages')
  let g:help_example_languages = #{ vim: 'vim' }
 endif
@@ -78,24 +80,32 @@ if has("conceal")
 else
  syn match helpIgnore		"." contained
 endif
-syn keyword helpNote		note Note NOTE note: Note: NOTE: Notes Notes:
-syn match helpNote		"\c(note\(:\|\>\)"ms=s+1
-syn keyword helpWarning		WARNING WARNING: Warning:
-syn keyword helpDeprecated	DEPRECATED DEPRECATED: Deprecated:
-syn match helpSpecial		"\<N\>"
-syn match helpSpecial		"\<N\.$"me=e-1
-syn match helpSpecial		"\<N\.\s"me=e-2
-syn match helpSpecial		"(N\>"ms=s+1

+" match 'iskeyword' word boundaries, '!-~,^*,^|,^",192-255'
+let s:iskeyword =  '!#-)+-{}~\d192-\d255'
+let s:start_word = $'\%(^\|[^{s:iskeyword}]\)\@1<='
+let s:end_word =      $'\%([^{s:iskeyword}]\|$\)\@='
+
+exec $'syn match helpNote	"{s:start_word}\%(note\|Note\|NOTE\|Notes\):\={s:end_word}"'
+exec $'syn match helpNote       "\c[[(]note\%(:\|{s:end_word}\)"ms=s+1'
+exec $'syn match helpWarning	"{s:start_word}\%(WARNING:\=\|Warning:\){s:end_word}"'
+exec $'syn match helpDeprecated	"{s:start_word}\%(DEPRECATED:\=\|Deprecated:\){s:end_word}"'
+exec $'syn match helpSpecial	"{s:start_word}N{s:end_word}"'
+exec $'syn match helpSpecial	"{s:start_word}N\.$"me=e-1'
+exec $'syn match helpSpecial	"{s:start_word}N\.\s"me=e-2'
+exec $'syn match helpSpecial	"(N{s:end_word}"ms=s+1'
 syn match helpSpecial		"\[N]"
 " avoid highlighting N  N in quickref.txt
 syn match helpSpecial		"N  N"he=s+1
 syn match helpSpecial		"Nth"me=e-2
 syn match helpSpecial		"N-1"me=e-2
 " highlighting N for :resize in windows.txt
-syn match helpSpecial		"] -N\>"ms=s+3
-syn match helpSpecial		"+N\>"ms=s+1
-syn match helpSpecial		"\[+-]N\>"ms=s+4
+exec $'syn match helpSpecial	"] -N{s:end_word}"ms=s+3'
+exec $'syn match helpSpecial	"+N{s:end_word}"ms=s+1'
+exec $'syn match helpSpecial	"\[+-]N{s:end_word}"ms=s+4'
+
+unlet s:iskeyword s:start_word s:end_word
+
 " highlighting N of cinoptions-values in indent.txt
 syn match helpSpecial		"^\t-\?\zsNs\?\s"me=s+1
 " highlighting N of cinoptions-values in indent.txt
@@ -183,6 +193,7 @@ let s:i = match(expand("%"), '\.\a\ax$')
 if s:i > 0
  exe "runtime syntax/help_" . strpart(expand("%"), s:i + 1, 2) . ".vim"
 endif
+unlet s:i

 syn sync minlines=40

--- a/runtime/syntax/help_ru.vim
+++ b/runtime/syntax/help_ru.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     Russian Vim program help files *.rux
-" Maintainer:   Restorer (restorers@users.sourceforge.net DEFUNCT)
-" Last Change:  04 Aprl 2017
+" Maintainer:   Restorer, <restorer@mail2k.ru>
+" Last Change:  2025 Jul 07
 " 

 " Проверяем язык локали и установки опции 'helplang'
@@ -10,56 +10,58 @@ if (v:lang !~? 'ru' || v:lang !~? 'russian') && &helplang !~? 'ru'
  finish
 endif

-" Подсветка русских гиперссылок
+" Определение синтаксиса русских гиперссылок
 syntax match helpHyperTextJump	"\\\@<!|[^"*~# |]\+|" contains=helpBar
 syntax match helpHyperTextEntry	"\*[^"*|]\+\*\s"he=e-1 contains=helpStar
 syntax match helpHyperTextEntry	"\*[^"*|]\+\*$" contains=helpStar

-" Заголовок статьи, раздела и т. п.
-syntax match helpHeadline   "^[А-ЯЁ]\{2}[ .]\=[-,А-ЯЁA-Z0-9 .()]*"
+" Определение синтаксиса статьи, подраздела и т. п.
+syntax match helpHeadline	"^[А-ЯЁ]\{2,}[ .]\=[-,А-ЯЁA-Z0-9 .()]*"

-" Наименование справочника
-" новый заголовок
-" syntax match helpVim      "\<СПРАВОЧНИК ПО РЕДАКТОРУ VIM\>"
-"старый заголовок
-syntax match helpVim      "\<СПРАВОЧНИК ПО .*"
-" новый заголовок
-"syntax match helpVim      "\<РУКОВОДСТВО ПОЛЬЗОВАТЕЛЯ РЕДАКТОРОМ VIM\>"
-"syntax match helpVim      "\<автор\%[ы:] .*$"
-"старый заголовок
-syntax match helpVim      "\<РУКОВОДСТВО ПОЛЬЗОВАТЕЛЯ .*"
-" Подсветка примечаний в тексте, начала примеров и т.п.
-syntax keyword helpNote     Примечание. Совет. Пример. Примеры:
-syntax keyword helpWarning   Внимание!
-" в старой версии документации
-syntax keyword helpNote     Замечание:
-" в старой версии документации
-syntax keyword helpWarning   ВНИМАНИЕ! Предупреждение:
-" Подсветка Ex-команд в документации Vim
-syntax match helpCommand     "\":[A-Za-z!]\+\""hs=s+1,he=e-1
-" Подсветка специальных обозначений
-syntax match helpSpecial    "{[-а-яёА-ЯЁ0-9'":%#=[\]<>.,]\+}"
-syntax match helpSpecial    "{[-а-яёА-ЯЁ0-9'"*+/:%#=[\]<>.,]\+}"
-syntax match helpSpecial    "\s\[[-а-яё^А-ЯЁ0-9_]\{2,}]"ms=s+1
-syntax match helpSpecial    "<[-а-яёА-ЯЁ0-9_]\+>"
-syntax match helpSpecial    "\[диапазон]"
-syntax match helpSpecial    "\[счётчик]"
-syntax match helpSpecial    "\[число]"
-syntax match helpSpecial    "\[+число]"
-syntax match helpSpecial    "\[-число]"
-syntax match helpSpecial    "\[кол-во]"
-syntax match helpSpecial    "\[строка]"
-syntax match helpSpecial    "\[смещение]"
-syntax match helpSpecial    "\[параметр]"
-syntax match helpSpecial    "\[параметры]"
-syntax match helpSpecial    "CTRL-{символ}"
-syntax region helpNotVi     start="{Доступно только" start="{В редкторе Vim" start="{В редакторе Vi" end="}" contains=helpLeadBlank,helpHyperTextJump
-" Подсветка примечаний переводчика
-syntax region helpTrnsNote  start="\[Прим. перевод." end="]" contains=helpComment
-" Определение группы подсветки Ex-команд в документации Vim
-"hi def link helpCommand     vimCommand
-" Определение группы подсветки примечаний переводчика
-hi def link helpTrnsNote    Comment
-" hi def link helpTrnsNote    Comment
+" Определение синтаксиса заголовка основного файла справки
+syntax match helpVim		"\<РЕДАКТОР VIM — общий обзор\>"
+" Определение синтаксиса наименования справочника
+syntax match helpVim		"\<СПРАВОЧНИК ПО РЕДАКТОРУ VIM\>"
+" Определение синтаксиса наименования руководства пользователя
+syntax match helpVim		"\<РУКОВОДСТВО ПОЛЬЗОВАТЕЛЯ ПО РЕДАКТОРУ VIM\>"
+" Определение синтаксиса автора справочника, руководства пользователя
+syntax match helpAutor		"^\s\+\<автор\%[ы:] .*$"
+" Определение синтаксиса примечаний в тексте, начала примеров и т. п.
+syntax keyword helpNote		Примечание\. Совет\. Пример\. Прмимер, Примеры:
+syntax keyword helpWarning	Внимание!
+syntax keyword helpDeprecated	Недействующий Недействующая Недействующее
+syntax keyword helpDeprecated	недейстующиий недействующая недействующее
+syntax keyword helpDeprecated	Устаревший Устаревшая Устаревшее
+syntax keyword helpDeprecated	устаревший устаревшая устаревшее
+" Определение синтаксиса Ex-команд в документации Vim (старый стиль)
+syntax match helpCommand	~\":\w\+\%[!]\"~hs=s+1,he=e-1
+" Определение синтаксиса специальных обозначений
+syntax match helpSpecial	"{[-а-яёА-ЯЁ0-9'":%#=[\]<>.,]\+}"
+syntax match helpSpecial	"{[-а-яёА-ЯЁ0-9'"*+/:%#=[\]<>.,_]\+}"
+syntax match helpSpecial	"\s\[[-а-яё^А-ЯЁ0-9_]\{2,}]"ms=s+1
+syntax match helpSpecial	"<[-а-яёА-ЯЁ0-9_]\+>"
+syntax match helpSpecial	"\[диапазон]"
+syntax match helpSpecial	"\[счётчик]"
+syntax match helpSpecial	"\[число]"
+syntax match helpSpecial	"\[+число]"
+syntax match helpSpecial	"\[-число]"
+syntax match helpSpecial	"\[кол-во]"
+syntax match helpSpecial	"\[строка]"
+syntax match helpSpecial	"\[смещение]"
+syntax match helpSpecial	"\[параметр]"
+syntax match helpSpecial	"\[параметры]"
+syntax match helpSpecial	"CTRL-{символ}"
+syntax region helpNotVi		start="{Доступно только" start="{В редкторе Vim" start="{В редакторе Vi" end="}" contains=helpLeadBlank,helpHyperTextJump
+" Определение синтаксиса примечаний переводчика
+syntax region helpTrnsNote	start="\[Примеч\. перев\. — " end="\]\." contains=helpComment
+" Группа подсветки синтаксиса Ex-команд внутри строки документации Vim
+hi def link helpCommand		VimCommand
+" Группа подсветки синтаксиса примеров в документации Vim
+hi def link helpExample		SpecialComment
+"hi def link helpExample		PreCondit
+" Группа подсветки синтаксиса примечаний переводчика
+hi def link helpTrnsNote	Comment
+" Группа подсветки синтаксиса автора справочника, руководства пользователя
+hi def link helpAutor		HelpVim
 "
 " vim: ts=8 sw=2
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -160,7 +160,8 @@ syn match   pythonEscape	"\\\o\{1,3}" contained
 syn match   pythonEscape	"\\x\x\{2}" contained
 syn match   pythonEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
 " Python allows case-insensitive Unicode IDs: http://www.unicode.org/charts/
-syn match   pythonEscape	"\\N{\a\+\%(\s\a\+\)*}" contained
+" The specification: https://www.unicode.org/versions/Unicode16.0.0/core-spec/chapter-4/#G135165
+syn match   pythonEscape	"\\N{\a\+\%(\%(\s\a\+[[:alnum:]]*\)\|\%(-[[:alnum:]]\+\)\)*}" contained
 syn match   pythonEscape	"\\$"

 " It is very important to understand all details before changing the
--- a/runtime/syntax/testdir/dumps/help_00.dump
+++ b/runtime/syntax/testdir/dumps/help_00.dump
@@ -0,0 +1,20 @@
+>V+0#af5f00255#ffffff0|I|M| |H|E|L|P| |F|I|L|E| |F|O|R|M|A|T| +0#0000000&@54
+@75
+@75
+|I+0#e000e06&|s@1|u|e| |#|1|7@1|2|1| |(|S|t|r|a|n|g|e| |>|v|i|m| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |h|e|l|p| |d|o|c|u|m|e|n|t|a|t|i|o|n|?|)|~+0#ffffff16&| +0#0000000&@10
+@75
+@32|*+0#ffffff16&|r+0#e000002&|e|s|t|o|r|e|-|c|u|r|s|o|r|*+0#ffffff16&| +0#0000000&|*+0#ffffff16&|l+0#e000002&|a|s|t|-|p|o|s|i|t|i|o|n|-|j|u|m|p|*+0#ffffff16&| +0#0000000&| +0#ffffff16&|>|v|i|m
+| +0#0000000&@3|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|R|e|s|t|o|r|e|C|u|r|s|o|r| @49
+@6|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@60
+@6|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|P|o|s|t| +0#0000000&|*+0#e000e06&| +0#0000000&@47
+@8|\+0#e000e06&| +0#0000000&|l+0#af5f00255&|e|t| +0#0000000&|l|i|n|e| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|i|n|e|(+0#e000e06&|"+0#e000002&|'|\+0#e000e06&|"|"+0#e000002&|)+0#e000e06&| +0#0000000&@42
+@8|\+0#e000e06&| +0#0000000&||| |i+0#af5f00255&|f| +0#0000000&|l|i|n|e| |>+0#af5f00255&|=| +0#0000000&|1+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|l|i|n|e| |<+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|i|n|e|(+0#e000e06&|"+0#e000002&|$|"|)+0#e000e06&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|&+0#00e0e07&|f|i|l|e|t|y|p|e| +0#0000000&|!+0#af5f00255&|~|#| +0#0000000&|'+0#e000002&|c|o|m@1|i|t|'| +0#0000000&@3
+@8|\+0#e000e06&| +0#0000000&@5|&+0#af5f00255&@1| +0#0000000&|i+0#00e0e07&|n|d|e|x|(+0#e000e06&|[|'+0#e000002&|x@1|d|'|,+0#0000000&| |'+0#e000002&|g|i|t|r|e|b|a|s|e|'|]+0#e000e06&|,+0#0000000&| |&+0#00e0e07&|f|i|l|e|t|y|p|e|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|-+0#af5f00255&|1+0#e000002&| +0#0000000&@12
+@8|\+0#e000e06&| +0#0000000&@5|&+0#af5f00255&@1| +0#0000000&|!+0#af5f00255&|&+0#00e0e07&|d|i|f@1| +0#0000000&@50
+@8|\+0#e000e06&| +0#0000000&||| @2|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|"+0#e000002&|n|o|r|m|a|l|!| |g|`|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@38
+@8|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@57
+@4|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @59
+@75
+@75
+|U+0#e000e06&|R|L|s|~+0#ffffff16&| +0#0000000&@69
+@57|1|,|1| @10|T|o|p| 
--- a/runtime/syntax/testdir/dumps/help_01.dump
+++ b/runtime/syntax/testdir/dumps/help_01.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&||| @2|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|"+0#e000002&|n|o|r|m|a|l|!| |g|`|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@38
+@8|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@57
+@4|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @59
+@75
+@75
+>U+0#e000e06&|R|L|s|~+0#ffffff16&| +0#0000000&@69
+@75
+@48|*+0#ffffff16&|g+0#e000002&|:|z|i|g|_|r|e|c|o|m@1|e|n|d|e|d|_|s|t|y|l|e|*+0#ffffff16&| +0#0000000&@1
+|B|y| |d|e|f|a|u|l|t| |t|h|e| |f|o|l@1|o|w|i|n|g| |i|n|d|e|n|t|a|t|i|o|n| |o|p|t|i|o|n|s| |a|r|e| |s|e|t|,| |i|n| |a|c@1|o|r|d|a|n|c|e| |w|i|t|h| |Z|i
+|g|'|s| @71
+|r|e|c|o|m@1|e|n|d|e|d| |s|t|y|l|e| |(|h+0#e000002&|t@1|p|s|:|/@1|z|i|g|l|a|n|g|.|o|r|g|/|d|o|c|u|m|e|n|t|a|t|i|o|n|/|m|a|s|t|e|r|/|)+0#0000000&|:| +0#ffffff16&|>| +0#0000000&@10
+@75
+@75
+|N+0#e000e06&|O|T|E|,| |W|A|R|N|I|N|G| |a|n|d| |D|E|P|R|E|C|A|T|E|D|~+0#ffffff16&| +0#0000000&@45
+@75
+|W|h|e|n| |y|o|u| |'|s|e|n|d| |a| |f|i|l|e| |t|o| |V|i|m|'|,| |V|i|m| |c|h|a|n|g|e|s| |t|o| |t|h|a|t| |f|i|l|e|'|s| |d|i|r|e|c|t|o|r|y|.| @1|N|o|t|e|,
+|h|o|w|e|v|e|r|,| |t|h|a|t| |a|n|y| |l|o|n|g| |d|i|r|e|c|t|o|r|y| |n|a|m|e|s| |w|i|l@1| |a|p@1|e|a|r| |i|n| |t|h|e|i|r| |s|h|o|r|t| |(|M|S|-|D|O|S|)| 
+|f|o|r|m| |o|n| |s|o|m|e| |W|i|n|d|o|w|s| |v|e|r|s|i|o|n|s|.| @1|T|h|i|s| |i|s| |a| |l|i|m|i|t|a|t|i|o|n| |o|f| |t|h|e| |W|i|n|d|o|w|s| |"|S|e|n|d| |T
+|o|"| @72
+@57|1|9|,|1| @9|8|1|%| 
--- a/runtime/syntax/testdir/dumps/help_02.dump
+++ b/runtime/syntax/testdir/dumps/help_02.dump
@@ -0,0 +1,20 @@
+|f+0&#ffffff0|o|r|m| |o|n| |s|o|m|e| |W|i|n|d|o|w|s| |v|e|r|s|i|o|n|s|.| @1|T|h|i|s| |i|s| |a| |l|i|m|i|t|a|t|i|o|n| |o|f| |t|h|e| |W|i|n|d|o|w|s| |"|S|e|n|d| |T
+|o|"| @72
+|m|e|c|h|a|n|i|s|m|.| @64
+@75
+>v|i|m|:| |s|e|t| |f|t|=|h|e|l|p|:| @57
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|3@1|,|1| @9|B|o|t| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
@@ -14,7 +14,7 @@
 |:| |h+0#af5f00255&|e|l|p| +0#0000000&@68
@1|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#+0#0000e05&| |F+0#0000001#ffff4012|I|X|M|E| +0#0000000#ffffff0@59
@75
-|:|2+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
-|:|3+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
 |:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
+|:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66
+|:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
@57|1|,|1| @10|T|o|p| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
@@ -1,11 +1,9 @@
 |:+0&#ffffff0| |h+0#af5f00255&|e|l|p| +0#0000000&@68
@1|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#+0#0000e05&| |F+0#0000001#ffff4012|I|X|M|E| +0#0000000#ffffff0@59
@75
-|:|2+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
-|:|3+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
->:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
+|:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
 |:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66
-|:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
+>:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
 |:|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&@65
 |:|a+0#af5f00255&|l@1| +0#0000000&@70
 |:|a+0#af5f00255&|m|e|n|u| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@66
 |:|a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@64
 |:|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
+|:|a+0#af5f00255&|r|g|s| +0#0000000&@69
+|:|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
@57|1|9|,|1| @10|1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
-|:|a+0#af5f00255&|r|g|s| +0#0000000&@69
-|:|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
+|:+0&#ffffff0|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
 |:|a+0#af5f00255&|s|c|i@1| +0#0000000&@68
 |:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| @62
->:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62
+|:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62
 |:|a+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
-|:|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@66
+>:|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@66
 |:|b+0#af5f00255&|a|d@1| +0#0000000&@69
 |:|b+0#af5f00255&|a|l@1| +0#0000000&@69
 |:|b+0#af5f00255&|a|l|t| +0#0000000&@69
@@ -17,4 +15,6 @@
 |:|b+0#af5f00255&|l|a|s|t| +0#0000000&@68
 |:|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64
 |:|b+0#af5f00255&|n|e|x|t| +0#0000000&@68
+|:|b+0#af5f00255&|N|e|x|t| +0#0000000&@68
+|:|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
@57|3|7|,|1| @10|2|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|b+0#af5f00255&|n|e|x|t| +0#0000000&@68
-|:|b+0#af5f00255&|N|e|x|t| +0#0000000&@68
-|:|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
+|:+0&#ffffff0|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
 |:|b+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 |:|b+0#af5f00255&|r|e|a|k| +0#0000000&@68
->:|b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@65
+|:|b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@65
 |:|b+0#af5f00255&|r|e|a|k|d|e|l| +0#0000000&@65
-|:|b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@64
+>:|b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@64
 |:|b+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
 |:|b+0#af5f00255&|r|o|w|s|e| +0#0000000&@67
 |:|b+0#af5f00255&|u|f|d|o| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@65
 |:|c+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
 |:|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
+|:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
+|:|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
@57|5@1|,|1| @10|4|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
-|:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
-|:|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
+|:+0&#ffffff0|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
 |:|c+0#af5f00255&|a|f|t|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|a|l@1| +0#0000000&@69
->:|c+0#af5f00255&|a|t|c|h| +0#0000000&@68
+|:|c+0#af5f00255&|a|t|c|h| +0#0000000&@68
 |:|c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@66
-|:|c+0#af5f00255&|b|e|l|o|w| +0#0000000&@67
+>:|c+0#af5f00255&|b|e|l|o|w| +0#0000000&@67
 |:|c+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@66
 |:|c+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@66
 |:|c+0#af5f00255&@1| +0#0000000&@71
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|f|d|o| +0#0000000&@69
 |:|c+0#af5f00255&|f|i|l|e| +0#0000000&@68
 |:|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
+|:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
+|:|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
@57|7|3|,|1| @10|5|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
-|:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
-|:|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
+|:+0&#ffffff0|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
 |:|c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@65
 |:|c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@66
->:|c+0#af5f00255&|h|d|i|r| +0#0000000&@68
+|:|c+0#af5f00255&|h|d|i|r| +0#0000000&@68
 |:|c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@64
-|:|c+0#af5f00255&|h|e|c|k|t|i|m|e| +0#0000000&@64
+>:|c+0#af5f00255&|h|e|c|k|t|i|m|e| +0#0000000&@64
 |:|c+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@65
 |:|c+0#af5f00255&|l|a|s@1| +0#0000000&@68
 |:|c+0#af5f00255&|l|a|s|t| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|c+0#af5f00255&|n|e|w|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|n|e|x|t| +0#0000000&@68
+|:|c+0#af5f00255&|N|e|x|t| +0#0000000&@68
+|:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
@57|9|1|,|1| @10|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|n|e|x|t| +0#0000000&@68
-|:|c+0#af5f00255&|N|e|x|t| +0#0000000&@68
-|:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
+|:+0&#ffffff0|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
->:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
+|:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |:|c+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
-|:|c+0#af5f00255&|o|l|d|e|r| +0#0000000&@67
+>:|c+0#af5f00255&|o|l|d|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@62
 |:|c+0#af5f00255&|o|m|c|l|e|a|r| +0#0000000&@65
 |:|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|o|p|y| +0#0000000&@69
 |:|c+0#af5f00255&|p|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
+|:|c+0#af5f00255&|q|u|i|t| +0#0000000&@68
+|:|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
@57|1|0|9|,|1| @9|8|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
-|:|c+0#af5f00255&|q|u|i|t| +0#0000000&@68
-|:|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
+|:+0&#ffffff0|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
 |:|c+0#af5f00255&|s|c|o|p|e| +0#0000000&@67
 |:|c+0#af5f00255&|s|t|a|g| +0#0000000&@68
->:|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
+|:|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
 |:|c+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
+>:|c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|c+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66
 |:|d+0#af5f00255&|e|b|u|g| +0#0000000&@68
 |:|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@62
@@ -17,4 +15,6 @@
 |:|d+0#af5f00255&|e|l|e|t|e| +0#0000000&@67
 |:|d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@62
 |:|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
+|:|d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@66
+|:|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
@57|1|2|7|,|1| @8|1|0|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
-|:|d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@66
-|:|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
+|:+0&#ffffff0|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
 |:|d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@64
 |:|d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@66
->:|d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@64
+|:|d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@64
 |:|d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@65
-|:|d+0#af5f00255&|i|f@1|u|p|d|a|t|e| +0#0000000&@63
+>:|d+0#af5f00255&|i|f@1|u|p|d|a|t|e| +0#0000000&@63
 |:|d+0#af5f00255&|i|g|r|a|p|h|s| +0#0000000&@65
 |:|d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@62
 |:|d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@62
@@ -17,4 +15,6 @@
 |:|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@64
 |:|d+0#af5f00255&|p| +0#0000000&@71
 |:|d+0#af5f00255&|r|o|p| +0#0000000&@69
+|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
+|:|d+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
@57|1|4|5|,|1| @8|1@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|d+0#af5f00255&|r|o|p| +0#0000000&@69
-|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
-|:|d+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
+|:+0&#ffffff0|d+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
 |:|e+0#af5f00255&|a|r|l|i|e|r| +0#0000000&@66
 |:|e+0#af5f00255&|c|h|o| +0#0000000&@69
->:|e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@62
+|:|e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@62
 |:|e+0#af5f00255&|c|h|o|e|r@1| +0#0000000&@66
-|:|e+0#af5f00255&|c|h|o|h|l| +0#0000000&@67
+>:|e+0#af5f00255&|c|h|o|h|l| +0#0000000&@67
 |:|e+0#af5f00255&|c|h|o|m|s|g| +0#0000000&@66
 |:|e+0#af5f00255&|c|h|o|n| +0#0000000&@68
 |:|e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@63
@@ -17,4 +15,6 @@
 |:|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@67
 |:|e|n|d|e|n|u|m| @66
 |:|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@67
+|:|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@62
+|:|e+0#af5f00255&|n|d|i|f| +0#0000000&@68
@57|1|6|3|,|1| @8|1|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@67
-|:|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@62
-|:|e+0#af5f00255&|n|d|i|f| +0#0000000&@68
+|:+0&#ffffff0|e+0#af5f00255&|n|d|i|f| +0#0000000&@68
 |:|e|n|d|i|n|t|e|r|f|a|c|e| @61
 |:|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67
->:|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@65
+|:|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@65
 |:|e+0#af5f00255&|n|e|w| +0#0000000&@69
-|:|e+0#af5f00255&|n|u|m| +0#0000000&@69
+>:|e+0#af5f00255&|n|u|m| +0#0000000&@69
 |:|e+0#af5f00255&|v|a|l| +0#0000000&@69
 |:|e+0#af5f00255&|x| +0#0000000&@71
 |:|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|f+0#af5f00255&|i|l|e|s| +0#0000000&@68
 |:|f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@65
 |:|f+0#af5f00255&|i|l|t|e|r| +0#0000000&@67
+|:|f+0#af5f00255&|i|n|a|l| +0#0000000&@68
+|:|f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@66
@57|1|8|1|,|1| @8|1|4|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|f+0#af5f00255&|i|l|t|e|r| +0#0000000&@67
-|:|f+0#af5f00255&|i|n|a|l| +0#0000000&@68
-|:|f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@66
+|:+0&#ffffff0|f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@66
 |:|f+0#af5f00255&|i|n|d| +0#0000000&@69
 |:|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@67
->:|f+0#af5f00255&|i|r|s|t| +0#0000000&@68
+|:|f+0#af5f00255&|i|r|s|t| +0#0000000&@68
 |:|f+0#af5f00255&|i|x|d|e|l| +0#0000000&@67
-|:|f+0#af5f00255&|o|l|d| +0#0000000&@69
+>:|f+0#af5f00255&|o|l|d| +0#0000000&@69
 |:|f+0#af5f00255&|o|l|d|c|l|o|s|e| +0#0000000&@64
 |:|f+0#af5f00255&|o|l|d@1|o|c|l|o|s|e|d| +0#0000000&@61
 |:|f+0#af5f00255&|o|l|d@1|o@1|p|e|n| +0#0000000&@63
@@ -17,4 +15,6 @@
 |:|g+0#af5f00255&|r|e|p| +0#0000000&@69
 |:|g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@66
 |:|g+0#af5f00255&|u|i| +0#0000000&@70
+|:|g+0#af5f00255&|v|i|m| +0#0000000&@69
+|:|h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@65
@57|1|9@1|,|1| @8|1|6|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|g+0#af5f00255&|u|i| +0#0000000&@70
-|:|g+0#af5f00255&|v|i|m| +0#0000000&@69
-|:|h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@65
+|:+0&#ffffff0|h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@65
 |:|h+0#af5f00255&|e|l|p| +0#0000000&@69
 |:|h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@64
->:|h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@65
+|:|h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@65
 |:|h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@65
-|:|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65
+>:|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65
 |:|h+0#af5f00255&|i|d|e| +0#0000000&@69
 |:|h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&@64
 |:|h+0#af5f00255&|i|s|t|o|r|y| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|i+0#af5f00255&|l|i|s|t| +0#0000000&@68
 |:|i+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
+|:|i+0#af5f00255&|m|e|n|u| +0#0000000&@68
+|:|i+0#af5f00255&|m|p|o|r|t| +0#0000000&@67
@57|2|1|7|,|1| @8|1|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
-|:|i+0#af5f00255&|m|e|n|u| +0#0000000&@68
-|:|i+0#af5f00255&|m|p|o|r|t| +0#0000000&@67
+|:+0&#ffffff0|i+0#af5f00255&|m|p|o|r|t| +0#0000000&@67
 |:|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
 |:|i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
->:|i+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
+|:|i+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|i+0#af5f00255&|n|t|e|r|f|a|c|e| +0#0000000&@64
-|:|i+0#af5f00255&|n|t|r|o| +0#0000000&@68
+>:|i+0#af5f00255&|n|t|r|o| +0#0000000&@68
 |:|i+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
 |:|i+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
 |:|i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
@@ -17,4 +15,6 @@
 |:|k+0#af5f00255&|e@1|p|a|l|t| +0#0000000&@66
 |:|k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@64
 |:|k+0#af5f00255&|e@1|p|m|a|r|k|s| +0#0000000&@64
+|:|k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@61
+|:|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
@57|2|3|5|,|1| @8|1|9|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|k+0#af5f00255&|e@1|p|m|a|r|k|s| +0#0000000&@64
-|:|k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@61
-|:|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
+|:+0&#ffffff0|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
 |:|l+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
 |:|l+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
->:|l+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
+|:|l+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
 |:|l+0#af5f00255&|a|f|t|e|r| +0#0000000&@67
-|:|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@65
+>:|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@65
 |:|l+0#af5f00255&|a|s|t| +0#0000000&@69
 |:|l+0#af5f00255&|a|t|e|r| +0#0000000&@68
 |:|l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|l+0#af5f00255&|c|l|o|s|e| +0#0000000&@67
 |:|l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@66
 |:|l+0#af5f00255&|d|o| +0#0000000&@70
+|:|l+0#af5f00255&|e|f|t| +0#0000000&@69
+|:|l+0#af5f00255&|e|f|t|a|b|o|v|e| +0#0000000&@64
@57|2|5|3|,|1| @8|2|0|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|l+0#af5f00255&|d|o| +0#0000000&@70
-|:|l+0#af5f00255&|e|f|t| +0#0000000&@69
-|:|l+0#af5f00255&|e|f|t|a|b|o|v|e| +0#0000000&@64
+|:+0&#ffffff0|l+0#af5f00255&|e|f|t|a|b|o|v|e| +0#0000000&@64
 |:|l+0#af5f00255&|e|g|a|c|y| +0#0000000&@67
 |:|l+0#af5f00255&|e|x|p|r| +0#0000000&@68
->:|l+0#af5f00255&|f|d|o| +0#0000000&@69
+|:|l+0#af5f00255&|f|d|o| +0#0000000&@69
 |:|l+0#af5f00255&|f|i|l|e| +0#0000000&@68
-|:|l+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
+>:|l+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|l+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
 |:|l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
 |:|l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@65
@@ -17,4 +15,6 @@
 |:|l+0#af5f00255&@1| +0#0000000&@71
 |:|l+0#af5f00255&@1|a|s|t| +0#0000000&@68
 |:|l+0#af5f00255&@1|i|s|t| +0#0000000&@68
+|:|l+0#af5f00255&|m|a|k|e| +0#0000000&@68
+|:|l+0#af5f00255&|m|a|p| +0#0000000&@69
@57|2|7|1|,|1| @8|2@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|l+0#af5f00255&@1|i|s|t| +0#0000000&@68
-|:|l+0#af5f00255&|m|a|k|e| +0#0000000&@68
-|:|l+0#af5f00255&|m|a|p| +0#0000000&@69
+|:+0&#ffffff0|l+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|l+0#af5f00255&|n|e|w|e|r| +0#0000000&@67
->:|l+0#af5f00255&|n|e|x|t| +0#0000000&@68
+|:|l+0#af5f00255&|n|e|x|t| +0#0000000&@68
 |:|l+0#af5f00255&|N|e|x|t| +0#0000000&@68
-|:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
+>:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
 |:|l+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
 |:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |#+0#0000e05&| |:|l|o|a|d|k|e|y|m|a|p| |#| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@33
@@ -17,4 +15,6 @@
 |:|l+0#af5f00255&|p|f|i|l|e| +0#0000000&@67
 |:|l+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 |:|l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
+|:|l+0#af5f00255&|s| +0#0000000&@71
+|:|l+0#af5f00255&|t|a|g| +0#0000000&@69
@57|2|8|9|,|1| @8|2|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
-|:|l+0#af5f00255&|s| +0#0000000&@71
-|:|l+0#af5f00255&|t|a|g| +0#0000000&@69
+|:+0&#ffffff0|l+0#af5f00255&|t|a|g| +0#0000000&@69
 |:|l+0#af5f00255&|u|a| +0#0000000&@70
 |:|l+0#af5f00255&|u|a|d|o| +0#0000000&@68
->:|l+0#af5f00255&|u|a|f|i|l|e| +0#0000000&@66
+|:|l+0#af5f00255&|u|a|f|i|l|e| +0#0000000&@66
 |:|l+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|l+0#af5f00255&|v|i|m|g|r|e|p| +0#0000000&@65
+>:|l+0#af5f00255&|v|i|m|g|r|e|p| +0#0000000&@65
 |:|l+0#af5f00255&|v|i|m|g|r|e|p|a|d@1| +0#0000000&@62
 |:|l+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66
 |:|m+0#af5f00255&|a|k|e| +0#0000000&@69
@@ -17,4 +15,6 @@
 |:|m+0#af5f00255&|e|n|u| +0#0000000&@69
 |:|m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@60
 |:|m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@65
+|:|m+0#af5f00255&|k|e|x|r|c| +0#0000000&@67
+|:|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64
@57|3|0|7|,|1| @8|2|5|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@65
-|:|m+0#af5f00255&|k|e|x|r|c| +0#0000000&@67
-|:|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64
+|:+0&#ffffff0|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64
 |:|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66
 |:|m+0#af5f00255&|k|v|i|e|w| +0#0000000&@67
->:|m+0#af5f00255&|k|v|i|m|r|c| +0#0000000&@66
+|:|m+0#af5f00255&|k|v|i|m|r|c| +0#0000000&@66
 |:|m+0#af5f00255&|o|v|e| +0#0000000&@69
-|:|m+0#af5f00255&|z|f|i|l|e| +0#0000000&@67
+>:|m+0#af5f00255&|z|f|i|l|e| +0#0000000&@67
 |:|m+0#af5f00255&|z|s|c|h|e|m|e| +0#0000000&@65
 |:|n+0#af5f00255&|b|c|l|o|s|e| +0#0000000&@66
 |:|n+0#af5f00255&|b|k|e|y| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|n+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@65
 |:|n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@64
+|:|n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@64
+|:|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63
@57|3|2|5|,|1| @8|2|6|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@64
-|:|n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@64
-|:|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63
+|:+0&#ffffff0|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63
 |:|n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&@63
 |:|n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@66
->:|n+0#af5f00255&|o|r|e|m|e|n|u| +0#0000000&@65
+|:|n+0#af5f00255&|o|r|e|m|e|n|u| +0#0000000&@65
 |:|n+0#af5f00255&|o|r|m|a|l| +0#0000000&@67
-|:|n+0#af5f00255&|o|s|w|a|p|f|i|l|e| +0#0000000&@63
+>:|n+0#af5f00255&|o|s|w|a|p|f|i|l|e| +0#0000000&@63
 |:|n+0#af5f00255&|u|m|b|e|r| +0#0000000&@67
 |:|n+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|n+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |:|o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@66
+|:|o+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
@57|3|4|3|,|1| @8|2|8|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@66
-|:|o+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
+|:+0&#ffffff0|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|o+0#af5f00255&|w|n|s|y|n|t|a|x| +0#0000000&@64
 |:|p+0#af5f00255&|a|c|k|a|d@1| +0#0000000&@66
->:|p+0#af5f00255&|a|c|k|l|o|a|d|a|l@1| +0#0000000&@62
+|:|p+0#af5f00255&|a|c|k|l|o|a|d|a|l@1| +0#0000000&@62
 |:|p+0#af5f00255&|c|l|o|s|e| +0#0000000&@67
-|:|p+0#af5f00255&|e|d|i|t| +0#0000000&@68
+>:|p+0#af5f00255&|e|d|i|t| +0#0000000&@68
 |:|p+0#af5f00255&|e|r|l| +0#0000000&@69
 |:|p+0#af5f00255&|e|r|l|d|o| +0#0000000&@67
 |:|p+0#af5f00255&|o|p| +0#0000000&@70
@@ -17,4 +15,6 @@
 |:|p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@66
 |:|p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@66
 |:|p+0#af5f00255&|r|o|m|p|t|f|i|n|d| +0#0000000&@63
+|:|p+0#af5f00255&|r|o|m|p|t|r|e|p|l| +0#0000000&@63
+|:|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
@57|3|6|1|,|1| @8|2|9|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|p+0#af5f00255&|r|o|m|p|t|f|i|n|d| +0#0000000&@63
-|:|p+0#af5f00255&|r|o|m|p|t|r|e|p|l| +0#0000000&@63
-|:|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
+|:+0&#ffffff0|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
 |:|p+0#af5f00255&|t|a|g| +0#0000000&@69
 |:|p+0#af5f00255&|t|f|i|r|s|t| +0#0000000&@66
->:|p+0#af5f00255&|t|j|u|m|p| +0#0000000&@67
+|:|p+0#af5f00255&|t|j|u|m|p| +0#0000000&@67
 |:|p+0#af5f00255&|t|l|a|s|t| +0#0000000&@67
-|:|p+0#af5f00255&|t|n|e|x|t| +0#0000000&@67
+>:|p+0#af5f00255&|t|n|e|x|t| +0#0000000&@67
 |:|p+0#af5f00255&|t|N|e|x|t| +0#0000000&@67
 |:|p+0#af5f00255&|t|p|r|e|v|i|o|u|s| +0#0000000&@63
 |:|p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@65
@@ -17,4 +15,6 @@
 |:|p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@66
 |:|p+0#af5f00255&|y|d|o| +0#0000000&@69
 |:|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67
+|:|p+0#af5f00255&|y|t|h|o|n| +0#0000000&@67
+|:|p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@66
@57|3|7|9|,|1| @8|3|1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67
-|:|p+0#af5f00255&|y|t|h|o|n| +0#0000000&@67
-|:|p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@66
+|:+0&#ffffff0|p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@66
 |:|p+0#af5f00255&|y|t|h|o|n|x| +0#0000000&@66
 |:|p+0#af5f00255&|y|x| +0#0000000&@70
->:|p+0#af5f00255&|y|x|d|o| +0#0000000&@68
+|:|p+0#af5f00255&|y|x|d|o| +0#0000000&@68
 |:|p+0#af5f00255&|y|x|f|i|l|e| +0#0000000&@66
-|:|q+0#af5f00255&|a|l@1| +0#0000000&@69
+>:|q+0#af5f00255&|a|l@1| +0#0000000&@69
 |:|q+0#af5f00255&|u|i|t| +0#0000000&@69
 |:|q+0#af5f00255&|u|i|t|a|l@1| +0#0000000&@66
 |:|r+0#af5f00255&|e|a|d| +0#0000000&@69
@@ -17,4 +15,6 @@
 |:|r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@60
 |:|r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@64
 |:|r+0#af5f00255&|e|s|i|z|e| +0#0000000&@67
+|:|r+0#af5f00255&|e|t|a|b| +0#0000000&@68
+|:|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67
@57|3|9|7|,|1| @8|3|2|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|r+0#af5f00255&|e|s|i|z|e| +0#0000000&@67
-|:|r+0#af5f00255&|e|t|a|b| +0#0000000&@68
-|:|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67
+|:+0&#ffffff0|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67
 |:|r+0#af5f00255&|e|w|i|n|d| +0#0000000&@67
 |:|r+0#af5f00255&|i|g|h|t| +0#0000000&@68
->:|r+0#af5f00255&|i|g|h|t|b|e|l|o|w| +0#0000000&@63
+|:|r+0#af5f00255&|i|g|h|t|b|e|l|o|w| +0#0000000&@63
 |:|r+0#af5f00255&|u|b|y| +0#0000000&@69
-|:|r+0#af5f00255&|u|b|y|d|o| +0#0000000&@67
+>:|r+0#af5f00255&|u|b|y|d|o| +0#0000000&@67
 |:|r+0#af5f00255&|u|b|y|f|i|l|e| +0#0000000&@65
 |:|r+0#af5f00255&|u|n|d|o| +0#0000000&@68
 |:|r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|s+0#af5f00255&|b|a|l@1| +0#0000000&@68
 |:|s+0#af5f00255&|b|f|i|r|s|t| +0#0000000&@66
 |:|s+0#af5f00255&|b|l|a|s|t| +0#0000000&@67
+|:|s+0#af5f00255&|b|m|o|d|i|f|i|e|d| +0#0000000&@63
+|:|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67
@57|4|1|5|,|1| @8|3|4|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|s+0#af5f00255&|b|l|a|s|t| +0#0000000&@67
-|:|s+0#af5f00255&|b|m|o|d|i|f|i|e|d| +0#0000000&@63
-|:|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67
+|:+0&#ffffff0|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67
 |:|s+0#af5f00255&|b|N|e|x|t| +0#0000000&@67
 |:|s+0#af5f00255&|b|p|r|e|v|i|o|u|s| +0#0000000&@63
->:|s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@65
+|:|s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@65
 |:|s+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@66
-|:|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@59
+>:|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@59
 |:|s+0#af5f00255&|c|r|i|p|t|n|a|m|e|s| +0#0000000&@62
 |:|s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@60
 |:|s+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|s+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|s+0#af5f00255&|h|e|l@1| +0#0000000&@68
 |:|s+0#af5f00255&|i|g|n| +0#0000000&@69
+|:|s+0#af5f00255&|i|l|e|n|t| +0#0000000&@67
+|:|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67
@57|4|3@1|,|1| @8|3|5|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|s+0#af5f00255&|i|g|n| +0#0000000&@69
-|:|s+0#af5f00255&|i|l|e|n|t| +0#0000000&@67
-|:|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67
+|:+0&#ffffff0|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67
 |:|s+0#af5f00255&|l|a|s|t| +0#0000000&@68
 |:|s+0#af5f00255&|l|e@1|p| +0#0000000&@68
->:|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@67
+|:|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@67
 |:|s+0#af5f00255&|m|a|g|i|c| +0#0000000&@67
-|:|s+0#af5f00255&|m|a|p| +0#0000000&@69
+>:|s+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|s+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|s+0#af5f00255&|m|i|l|e| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|s+0#af5f00255&|o|r|t| +0#0000000&@69
 |:|s+0#af5f00255&|o|u|r|c|e| +0#0000000&@67
 |:|s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@64
+|:|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64
+|:|s+0#af5f00255&|p|e|l@1|i|n|f|o| +0#0000000&@64
@57|4|5|1|,|1| @8|3|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@64
-|:|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64
-|:|s+0#af5f00255&|p|e|l@1|i|n|f|o| +0#0000000&@64
+|:+0&#ffffff0|s+0#af5f00255&|p|e|l@1|i|n|f|o| +0#0000000&@64
 |:|s+0#af5f00255&|p|e|l@1|r|a|r|e| +0#0000000&@64
 |:|s+0#af5f00255&|p|e|l@1|r|e|p|a|l@1| +0#0000000&@62
->:|s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@64
+|:|s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@64
 |:|s+0#af5f00255&|p|e|l@1|w|r|o|n|g| +0#0000000&@63
-|:|s+0#af5f00255&|p|l|i|t| +0#0000000&@68
+>:|s+0#af5f00255&|p|l|i|t| +0#0000000&@68
 |:|s+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 |:|s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
 |:|s+0#af5f00255&|t|a|g| +0#0000000&@69
@@ -17,4 +15,6 @@
 |:|s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@63
 |:|s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@65
 |:|s+0#af5f00255&|u|b|s|t|i|t|u|t|e| +0#0000000&@63
+|:|s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@66
+|:|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
@57|4|6|9|,|1| @8|3|8|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|s+0#af5f00255&|u|b|s|t|i|t|u|t|e| +0#0000000&@63
-|:|s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@66
-|:|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:+0&#ffffff0|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|s+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|s+0#af5f00255&|u|s|p|e|n|d| +0#0000000&@66
->:|s+0#af5f00255&|v|i|e|w| +0#0000000&@68
+|:|s+0#af5f00255&|v|i|e|w| +0#0000000&@68
 |:|s+0#af5f00255&|w|a|p|n|a|m|e| +0#0000000&@65
-|:|s+0#af5f00255&|y|n|c|b|i|n|d| +0#0000000&@65
+>:|s+0#af5f00255&|y|n|c|b|i|n|d| +0#0000000&@65
 |:|s+0#af5f00255&|y|n|t|a|x| +0#0000000&@67
 |:|s+0#af5f00255&|y|n|t|i|m|e| +0#0000000&@66
 |:|t+0#af5f00255&|a|b| +0#0000000&@70
@@ -17,4 +15,6 @@
 |:|t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67
+|:|t+0#af5f00255&|a|b|n|e|x|t| +0#0000000&@66
+|:|t+0#af5f00255&|a|b|N|e|x|t| +0#0000000&@66
@57|4|8|7|,|1| @8|4|0|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67
-|:|t+0#af5f00255&|a|b|n|e|x|t| +0#0000000&@66
-|:|t+0#af5f00255&|a|b|N|e|x|t| +0#0000000&@66
+|:+0&#ffffff0|t+0#af5f00255&|a|b|N|e|x|t| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|o|n|l|y| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|p|r|e|v|i|o|u|s| +0#0000000&@62
->:|t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@64
+|:|t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@64
 |:|t+0#af5f00255&|a|b|s| +0#0000000&@69
-|:|t+0#af5f00255&|a|g| +0#0000000&@70
+>:|t+0#af5f00255&|a|g| +0#0000000&@70
 |:|t+0#af5f00255&|a|g|s| +0#0000000&@69
 |:|t+0#af5f00255&|c|d| +0#0000000&@70
 |:|t+0#af5f00255&|c|h|d|i|r| +0#0000000&@67
@@ -17,4 +15,6 @@
 |:|t+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|t+0#af5f00255&|h|r|o|w| +0#0000000&@68
 |:|t+0#af5f00255&|j|u|m|p| +0#0000000&@68
+|:|t+0#af5f00255&|l|a|s|t| +0#0000000&@68
+|:|t+0#af5f00255&|l|m|e|n|u| +0#0000000&@67
@57|5|0|5|,|1| @8|4|1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|t+0#af5f00255&|j|u|m|p| +0#0000000&@68
-|:|t+0#af5f00255&|l|a|s|t| +0#0000000&@68
-|:|t+0#af5f00255&|l|m|e|n|u| +0#0000000&@67
+|:+0&#ffffff0|t+0#af5f00255&|l|m|e|n|u| +0#0000000&@67
 |:|t+0#af5f00255&|l|n|o|r|e|m|e|n|u| +0#0000000&@63
 |:|t+0#af5f00255&|l|u|n|m|e|n|u| +0#0000000&@65
->:|t+0#af5f00255&|m|a|p| +0#0000000&@69
+|:|t+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
-|:|t+0#af5f00255&|m|e|n|u| +0#0000000&@68
+>:|t+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|t+0#af5f00255&|n|e|x|t| +0#0000000&@68
 |:|t+0#af5f00255&|N|e|x|t| +0#0000000&@68
 |:|t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
@@ -17,4 +15,6 @@
 |:|t+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|t+0#af5f00255&|y|p|e| +0#0000000&@69
+|:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
+|:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
@57|5|2|3|,|1| @8|4|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|t+0#af5f00255&|y|p|e| +0#0000000&@69
-|:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
-|:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
+|:+0&#ffffff0|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
 |:|u+0#af5f00255&|n|d|o| +0#0000000&@69
 |:|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65
->:|u+0#af5f00255&|n|d|o|l|i|s|t| +0#0000000&@65
+|:|u+0#af5f00255&|n|d|o|l|i|s|t| +0#0000000&@65
 |:|u+0#af5f00255&|n|h|i|d|e| +0#0000000&@67
-|:|u+0#af5f00255&|n|i|q| +0#0000000&@69
+>:|u+0#af5f00255&|n|i|q| +0#0000000&@69
 |:|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&@64
 |:|u+0#af5f00255&|n|m|a|p| +0#0000000&@68
 |:|u+0#af5f00255&|n|m|e|n|u| +0#0000000&@67
@@ -17,4 +15,6 @@
 |:|v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@65
 |:|v+0#af5f00255&|g|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@61
 |:|v+0#af5f00255&|i|e|w| +0#0000000&@69
+|:|v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@66
+|#+0#0000e05&| |:|v|i|m|9|s|c|r|i|p|t| +0#0000000&@61
@57|5|4|1|,|1| @8|4@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|v+0#af5f00255&|i|e|w| +0#0000000&@69
-|:|v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@66
-|#+0#0000e05&| |:|v|i|m|9|s|c|r|i|p|t| +0#0000000&@61
+|#+0#0000e05#ffffff0| |:|v|i|m|9|s|c|r|i|p|t| +0#0000000&@61
 |:|v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@66
 |:|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63
->:|v+0#af5f00255&|i|s|u|a|l| +0#0000000&@67
+|:|v+0#af5f00255&|i|s|u|a|l| +0#0000000&@67
 |:|v+0#af5f00255&|i|u|s|a|g|e| +0#0000000&@66
-|:|v+0#af5f00255&|m|a|p| +0#0000000&@69
+>:|v+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|v+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|v+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|v+0#af5f00255&|n|e|w| +0#0000000&@69
@@ -17,4 +15,6 @@
 |:|w+0#af5f00255&|a|l@1| +0#0000000&@69
 |:|w+0#af5f00255&|h|i|l|e| +0#0000000&@68
 |:|w+0#af5f00255&|i|n|c|m|d| +0#0000000&@67
+|:|w+0#af5f00255&|i|n|d|o| +0#0000000&@68
+|:|w+0#af5f00255&|i|n|p|o|s| +0#0000000&@67
@57|5@1|9|,|1| @8|4|6|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|w+0#af5f00255&|i|n|c|m|d| +0#0000000&@67
-|:|w+0#af5f00255&|i|n|d|o| +0#0000000&@68
-|:|w+0#af5f00255&|i|n|p|o|s| +0#0000000&@67
+|:+0&#ffffff0|w+0#af5f00255&|i|n|p|o|s| +0#0000000&@67
 |:|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66
 |:|w+0#af5f00255&|n|e|x|t| +0#0000000&@68
->:|w+0#af5f00255&|N|e|x|t| +0#0000000&@68
+|:|w+0#af5f00255&|N|e|x|t| +0#0000000&@68
 |:|w+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
-|:|w+0#af5f00255&|q| +0#0000000&@71
+>:|w+0#af5f00255&|q| +0#0000000&@71
 |:|w+0#af5f00255&|q|a|l@1| +0#0000000&@68
 |:|w+0#af5f00255&|r|i|t|e| +0#0000000&@68
 |:|w+0#af5f00255&|u|n|d|o| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |:|x+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@65
+|:|x+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
@57|5|7@1|,|1| @8|4|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
@@ -1,20 +1,20 @@
-|:+0&#ffffff0|x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@65
-|:|x+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
+|:+0&#ffffff0|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|y+0#af5f00255&|a|n|k| +0#0000000&@69
 |:|z+0#af5f00255&| +0#0000000&@72
-> @74
+@75
 |F|o@1|(+0#e000e06&|)||+0#0000000&|h+0#af5f00255&|e|l|p| +0#0000000&@64
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&|||h+0#af5f00255&|e|l|p| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)||+0#0000000&| |h+0#af5f00255&|e|l|p| +0#0000000&@63
@75
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |2+0#af5f00255&|m|a|t|c|h| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |3+0#af5f00255&|m|a|t|c|h| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|l@1| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@61
-@57|5|9|5|,|0|-|1| @6|4|9|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|a|d@1| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|d|u|p|e| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@57
+@57|5|9|5|,|1| @8|4|9|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|a|d@1| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|d|u|p|e| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@57
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|o| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|o| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|s| +0#0000000&@62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|s| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|s|c|i@1| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| ||| |a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @41
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l@1| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|d|e|l|e|t|e| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@54
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@54
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@56
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
@57|6|1|3|,|1| @8|5|0|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|d|e|l|e|t|e| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@54
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@54
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|l|a|s|t| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|l|a|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|n|e|x|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|N|e|x|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@58
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|e|a|k| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@58
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|o|w|s|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f|d|o| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|n|l|o|a|d| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|w|i|p|e|o|u|t| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@59
@57|6|3|1|,|1| @8|5|2|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|n|l|o|a|d| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|w|i|p|e|o|u|t| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@59
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@58
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|b|o|v|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@58
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|f|t|e|r| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|l@1| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&@61
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1| +0#0000000&@64
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1|l|o|s|e| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d| +0#0000000&@64
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d|o| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|e|n|t|e|r| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|e|x|p|r| +0#0000000&@61
@57|6|4|9|,|1| @8|5|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1|l|o|s|e| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d| +0#0000000&@64
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d|o| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|e|n|t|e|r| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|e|x|p|r| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|f|d|o| +0#0000000&@62
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|e|x|p|r| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|f|d|o| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|f|i|l|e| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@58
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|d|i|r| +0#0000000&@61
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|a|s@1| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|a|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|e|a|r|j|u|m|p|s| +0#0000000&@56
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|i|s|t| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|o|s|e| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
@57|6@1|7|,|1| @8|5@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|e|a|r|j|u|m|p|s| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|i|s|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|o|s|e| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|e|n|u| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|e|n|u| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|e|w|e|r| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|e|x|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|N|e|x|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|f|i|l|e| +0#0000000&@60
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|f|i|l|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|N|f|i|l|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|c|l|e|a|r| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|p|i|l|e|r| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|s|t| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|t|i|n|u|e| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|e|n| +0#0000000&@61
@57|6|8|5|,|1| @8|5|6|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|p|i|l|e|r| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|s|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|t|i|n|u|e| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|e|n| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|y| +0#0000000&@62
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|e|n| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|y| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|p|f|i|l|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|q|u|i|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|s|c|o|p|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|s|t|a|g| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@57
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|b|u|g| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@56
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@56
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|e|r| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@56
@57|7|0|3|,|1| @8|5|8|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|e|r| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@56
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@60
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@56
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@57
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|p|l|a|y| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|j|u|m|p| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l| +0#0000000&@64
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l|i|s|t| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@57
@57|7|2|1|,|1| @8|5|9|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|p|l|a|y| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|j|u|m|p| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l| +0#0000000&@64
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l|i|s|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@57
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@57
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|p| +0#0000000&@64
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|r|o|p| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|s|p|l|i|t| +0#0000000&@60
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|s|p|l|i|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|a|r|l|i|e|r| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@55
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|n| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|d|i|t| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e|i|f| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|m|e|n|u| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|c|l|a|s@1| @58
@57|7|3|9|,|1| @8|6|1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|d|i|t| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e|i|f| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|m|e|n|u| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|c|l|a|s@1| @58
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|c|l|a|s@1| @58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|e|n|u|m| @59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@55
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@61
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|i|n|t|e|r|f|a|c|e| @54
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@58
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x| +0#0000000&@64
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|i|t| +0#0000000&@62
-@57|7|5|7|,|1| @8|6|2|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|p|o|r|t| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|p|o|r|t| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|u|s|a|g|e| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e| +0#0000000&@62
+@57|7|5|7|,|1| @8|6|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|i|t| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|p|o|r|t| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|p|o|r|t| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|u|s|a|g|e| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e| +0#0000000&@62
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|s| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|s| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|t|e|r| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|d| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|i|s|h| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|r|s|t| +0#0000000&@61
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|l|d@1|o|c|l|o|s|e|d| +0#0000000&@54
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|l|d@1|o@1|p|e|n| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|l|d|o|p|e|n| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@43
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@55
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|o|t|o| +0#0000000&@62
@57|7@1|5|,|1| @8|6|4|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|l|d|o|p|e|n| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@43
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@55
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|o|t|o| +0#0000000&@62
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p| +0#0000000&@62
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|o|t|o| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|u|i| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|v|i|m| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@58
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@58
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|i|s|t|o|r|y| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|o|r|i|z|o|n|t|a|l| +0#0000000&@56
-@57|7|9|3|,|1| @8|6|5|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|f| +0#0000000&@64
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|j|u|m|p| +0#0000000&@61
+@57|7|9|3|,|1| @8|6@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|o|r|i|z|o|n|t|a|l| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|f| +0#0000000&@64
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|j|u|m|p| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|l|i|s|t| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|j|u|m|p| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|l|i|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|e|n|u| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|p|o|r|t| +0#0000000&@60
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|p|o|r|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|s|p|l|i|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|o|i|n| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|a|l|t| +0#0000000&@59
@57|8|1@1|,|1| @8|6|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|o|i|n| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|a|l|t| +0#0000000&@59
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@57
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|a|l|t| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|m|a|r|k|s| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@54
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|b|o|v|e| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@56
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|f|t|e|r| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@59
-@57|8|2|9|,|1| @8|6|8|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|d| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|h|d|i|r| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@60
+@57|8|2|9|,|1| @8|6|9|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|d| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|h|d|i|r| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@59
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|d|o| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|e|f|t| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|e|f|t|a|b|o|v|e| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|e|g|a|c|y| +0#0000000&@60
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|e|g|a|c|y| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|e|x|p|r| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|f|d|o| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|f|i|l|e| +0#0000000&@61
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p|a|d@1| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|e|l|p|g|r|e|p| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|i|s|t| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@64
@57|8|4|7|,|1| @8|7|0|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p|a|d@1| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|e|l|p|g|r|e|p| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|i|s|t| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@64
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|a|s|t| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@64
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|a|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|i|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|m|a|k|e| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|m|a|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|e|w|e|r| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|e|x|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|e|x|t| +0#0000000&@61
@@ -17,4 +13,8 @@
 |#+0#0000e05&| |F|o@1|(|)| ||| |l|o|a|d|k|e|y|m|a|p| |#| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@26
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@57
-@57|8|6|5|,|1| @8|7|1|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|l|d|e|r| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|p|e|n| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@60
+@57|8|6|5|,|1| @8|7|2|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|l|d|e|r| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|p|e|n| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@57
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|s| +0#0000000&@64
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|t|a|g| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|a| +0#0000000&@63
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|a| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|a|d|o| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|a|f|i|l|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|k|e| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|o|v|e| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p|c|l|e|a|r| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k|s| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|t|c|h| +0#0000000&@61
@57|8@1|3|,|1| @8|7|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|o|v|e| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p|c|l|e|a|r| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k|s| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|t|c|h| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u| +0#0000000&@62
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|t|c|h| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@53
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|e|x|r|c| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@57
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|v|i|e|w| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|v|i|m|r|c| +0#0000000&@59
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|k|e|y| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|w| +0#0000000&@63
-@57|9|0|1|,|1| @8|7|4|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@61
+@57|9|0|1|,|1| @8|7|5|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|w| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@58
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@56
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&@56
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|e|m|e|n|u| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|m|a|l| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|e|n|u| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|l|y| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
@57|9|1|9|,|1| @8|7|6|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|e|n|u| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|l|y| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|w|n|s|y|n|t|a|x| +0#0000000&@57
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|w|n|s|y|n|t|a|x| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|a|c|k|a|d@1| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|a|c|k|l|o|a|d|a|l@1| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|c|l|o|s|e| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p|u|p| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&@1|o|p| +0#0000000&@62
-@57|9|3|7|,|1| @8|7@1|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|s|e|r|v|e| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|i|n|t| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@59
+@57|9|3|7|,|1| @8|7|8|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&@1|o|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|s|e|r|v|e| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|i|n|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@59
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@59
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|m|p|t|f|i|n|d| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|m|p|t|r|e|p|l| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|a|g| +0#0000000&@62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|a|g| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|f|i|r|s|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|j|u|m|p| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|l|a|s|t| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|u|t| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|w|d| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|d|o| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@59
@57|9|5@1|,|1| @8|7|9|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|u|t| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|w|d| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|d|o| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@59
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|d|o| +0#0000000&@62
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|d|o| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|f|i|l|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|x| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|x| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|x| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|x|d|o| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|x|f|i|l|e| +0#0000000&@59
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|a|d| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|i|r| +0#0000000&@61
-@57|9|7|3|,|1| @8|8|0|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|o| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|s|t|a|t|u|s| +0#0000000&@54
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@53
+@57|9|7|3|,|1| @8|8|1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|i|r| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|o| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|s|t|a|t|u|s| +0#0000000&@54
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@53
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@57
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@53
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|s|i|z|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|t|a|b| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|w|i|n|d| +0#0000000&@60
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|w|i|n|d| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|i|g|h|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|i|g|h|t|b|e|l|o|w| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|b|y| +0#0000000&@62
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|l@1| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|n|d|b|o|x| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|r|g|u|m|e|n|t| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|v|e|a|s| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|a|l@1| +0#0000000&@61
@57|9@1|1|,|1| @8|8|2|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|l@1| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|n|d|b|o|x| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|r|g|u|m|e|n|t| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|v|e|a|s| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|a|l@1| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|f|i|r|s|t| +0#0000000&@59
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|a|l@1| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|f|i|r|s|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|l|a|s|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|m|o|d|i|f|i|e|d| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|n|e|x|t| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|N|e|x|t| +0#0000000&@60
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|N|e|x|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|p|r|e|v|i|o|u|s| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@59
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|f|i|l|e|t|y|p|e| +0#0000000&@55
-@57|1|0@1|9|,|1| @7|8|3|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|g|l|o|b|a|l| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|l|o|c|a|l| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|n|d| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
+@57|1|0@1|9|,|1| @7|8|4|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|f|i|l|e|t|y|p|e| +0#0000000&@55
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|g|l|o|b|a|l| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|l|o|c|a|l| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|n|d| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|h|e|l@1| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|h|e|l@1| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|i|g|n| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|i|l|e|n|t| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|i|m|a|l|t| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|l|a|s|t| +0#0000000&@61
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|l|a|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|l|e@1|p| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|l|e@1|p|!| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|g|i|c| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|i|l|e| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|e|x|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|N|e|x|t| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|m|a|g|i|c| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|r|t| +0#0000000&@62
@57|1|0|2|7|,|1| @7|8|5|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|N|e|x|t| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|m|a|g|i|c| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|r|t| +0#0000000&@62
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|u|r|c|e| +0#0000000&@60
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|r|t| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|u|r|c|e| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|i|n|f|o| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|r|a|r|e| +0#0000000&@57
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|r|a|r|e| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|r|e|p|a|l@1| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|w|r|o|n|g| +0#0000000&@56
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|g| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|g|r|e|p|l|a|c|e| +0#0000000&@53
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|i|n|s|e|r|t| +0#0000000&@55
-@57|1|0|4|5|,|1| @7|8|6|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|r|e|p|l|a|c|e| +0#0000000&@54
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|j|u|m|p| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@56
+@57|1|0|4|5|,|1| @7|8|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|i|n|s|e|r|t| +0#0000000&@55
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|r|e|p|l|a|c|e| +0#0000000&@54
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|j|u|m|p| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@56
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@58
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@56
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|b|s|t|i|t|u|t|e| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|s|p|e|n|d| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|v|i|e|w| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|w|a|p|n|a|m|e| +0#0000000&@58
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|c|l|o|s|e| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|d|o| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|e|d|i|t| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|n|d| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|r|s|t| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@59
@57|1|0|6|3|,|1| @7|8@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|d|o| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|e|d|i|t| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|n|d| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|r|s|t| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@59
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@59
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|n|e|w| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|n|e|x|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|N|e|x|t| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|o|n|l|y| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|o|n|l|y| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|p|r|e|v|i|o|u|s| +0#0000000&@55
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|s| +0#0000000&@62
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|h|d|i|r| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|d|o| +0#0000000&@61
-@57|1|0|8|1|,|1| @7|8|9|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|f|i|l|e| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|a|r|o|f@1| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|r|m|i|n|a|l| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
+@57|1|0|8|1|,|1| @7|9|0|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|d|o| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|f|i|l|e| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|a|r|o|f@1| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|r|m|i|n|a|l| +0#0000000&@58
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|h|r|o|w| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|f|i|r|s|t| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|h|r|o|w| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|j|u|m|p| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|l|a|s|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|l|m|e|n|u| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|l|n|o|r|e|m|e|n|u| +0#0000000&@56
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|l|n|o|r|e|m|e|n|u| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|l|u|n|m|e|n|u| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|m|a|p| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|o|p|l|e|f|t| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|y| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|s|e|l|e|c|t| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
@57|1|0|9@1|,|1| @7|9|1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|y| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|s|e|l|e|c|t| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|y|p|e| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@54
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@54
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|d|o| +0#0000000&@62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|d|o| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|d|o|l|i|s|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|h|i|d|e| +0#0000000&@60
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|s|i|l|e|n|t| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|p|d|a|t|e| +0#0000000&@60
-@57|1@2|7|,|1| @7|9|2|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|a|r| +0#0000000&@63
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|b|o|s|e| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|s|i|o|n| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@58
+@57|1@2|7|,|1| @7|9|3|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|p|d|a|t|e| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|a|r| +0#0000000&@63
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|b|o|s|e| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|s|i|o|n| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@58
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|g|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@54
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|g|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@54
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@59
 |#+0#0000e05&| |c|a|l@1| |F|o@1|(|)| ||| |v|i|m|9|s|c|r|i|p|t| +0#0000000&@49
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@56
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@56
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|s|u|a|l| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|u|s|a|g|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|e|w| +0#0000000&@62
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|e|w| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|s|p|l|i|t| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@61
@57|1@1|3|5|,|1| @7|9|4|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|s|p|l|i|t| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@61
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|r|i|t|e| +0#0000000&@61
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|r|i|t|e| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|N|e|x|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|a|l@1| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|h|i|l|e| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@59
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|c|m|d| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|p|o|s| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|n|e|x|t| +0#0000000&@61
@@ -17,4 +13,8 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|u|n|d|o| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|a|l@1| +0#0000000&@62
-@57|1@1|5|3|,|1| @7|9|5|%| 
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p| +0#0000000&@62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|e|n|u| +0#0000000&@61
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@58
+@57|1@1|5|3|,|1| @7|9|6|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|a|l@1| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|e|n|u| +0#0000000&@61
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@58
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|u|n|m|a|p| +0#0000000&@60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@59
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |y+0#af5f00255&|a|n|k| +0#0000000&@62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |y+0#af5f00255&|a|n|k| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |z+0#af5f00255&| +0#0000000&@65
@75
@75
@@ -17,4 +13,8 @@
 |:+0#af5f00255&|a|p@1|e|n|d| +0#0000000&@67
 | +0#e000002&@3|t|e|x|t| +0#0000000&@66
 |.+0#af5f00255&| +0#0000000&@73
+|:+0#af5f00255&|c|h|a|n|g|e| +0#0000000&@67
+| +0#e000002&@3|t|e|x|t| +0#0000000&@66
+|.+0#af5f00255&| +0#0000000&@73
+|:+0#af5f00255&|i|n|s|e|r|t| +0#0000000&@67
@57|1@1|7|1|,|1| @7|9|7|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump
@@ -1,13 +1,9 @@
-|.+0#af5f00255#ffffff0| +0#0000000&@73
-|:+0#af5f00255&|c|h|a|n|g|e| +0#0000000&@67
+|:+0#af5f00255#ffffff0|i|n|s|e|r|t| +0#0000000&@67
 | +0#e000002&@3|t|e|x|t| +0#0000000&@66
 |.+0#af5f00255&| +0#0000000&@73
-|:+0#af5f00255&|i|n|s|e|r|t| +0#0000000&@67
-| +0#e000002&@3>t|e|x|t| +0#0000000&@66
-|.+0#af5f00255&| +0#0000000&@73
 |:|k+0#af5f00255&| +0#0000000&@72
 |:|l+0#af5f00255&|e|t| +0#0000000&@70
-|:|m+0#af5f00255&|o|d|e| +0#0000000&@69
+>:|m+0#af5f00255&|o|d|e| +0#0000000&@69
 |:|o+0#af5f00255&|p|e|n| +0#0000000&@69
 |:|t+0#af5f00255&| +0#0000000&@72
 |:|u+0#af5f00255&|n|l|e|t| +0#0000000&@68
@@ -17,4 +13,8 @@
@4|t|e|x|t| @66
 |.+0#af5f00255&| +0#0000000&@73
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e| +0#0000000&@60
-@57|1@1|8|9|,|5| @7|9|8|%| 
+@4|t|e|x|t| @66
+|.+0#af5f00255&| +0#0000000&@73
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i|n|s|e|r|t| @60
+@4|t|e|x|t| @66
+@57|1@1|8|9|,|1| @7|9@1|%| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump
@@ -1,13 +1,9 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e| +0#0000000&@60
-@4|t|e|x|t| @66
+| +0&#ffffff0@3|t|e|x|t| @66
 |.+0#af5f00255&| +0#0000000&@73
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i|n|s|e|r|t| @60
-@4|t|e|x|t| @66
->.+0#af5f00255&| +0#0000000&@73
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&| +0#0000000&@65
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|e|t| +0#0000000&@63
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|o|d|e| +0#0000000&@62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&| +0#0000000&@65
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|l|e|t| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@63
@@ -17,4 +13,8 @@
 |~| @73
 |~| @73
 |~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
 | +0#0000000&@56|1|2|0|7|,|1| @7|B|o|t| 
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
@@ -15,6 +15,6 @@
@2|f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@8|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37
@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62
@2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
-@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s|:|D|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54
+@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
@57|1|,|1| @10|T|o|p| 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Foxe Chen	d0bf380efa	patch 9.1.1543: Wayland: clipboard appears to not be working Problem: Wayland: clipboard appears to not be working (Fuad Veliev) Solution: Explicitly set selection each time (Foxe Chen) fixes: #17732 closes: #17740 Signed-off-by: Foxe Chen <chen.foxe@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-14 21:54:23 +02:00
Christian Brabandt	6865bdc914	patch 9.1.1542: Coverity complains about uninitialized variable Problem: Coverity complains about uninitialized variable (Tony Mechelynck) Solution: Initialize variables closes: #17717 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-14 21:46:46 +02:00
Yegappan Lakshmanan	ada6b27ff1	patch 9.1.1541: Vim9: error when last enum value ends with a comma Problem: Vim9: error when last enum value ends with a comma Solution: Allow trailing commas in enum values (Yegappan Lakshmanan). closes: #17744 Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-14 21:27:34 +02:00
Doug Kearns	1341176e7b	runtime(vim): Update help syntax file, improve highlighting of included Vim examples - Take over as file maintainer. - Improve highlighting of legacy script examples by using :syn-iskeyword with the default 'iskeyword' value. Vim9 script examples are not supported yet. - Match admonition labels in more contexts. - Match URLs in more contexts. fixes #17721 closes: #17731 Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 17:53:26 +02:00
Girish Palya	f6a308c65b	patch 9.1.1540: completion: menu state wrong on interruption Problem: completion: menu state wrong on interruption (Maxim Kim) Solution: Call show_pum() if completion was interrupted (Girish Palya). Popup menu was not built after fuzzy sorting, so internal state wasn't reflected on screen. No test. Couldn't get the terminal test to trigger both interruption and refresh together. fixes: #17725 closes: #17736 Signed-off-by: Girish Palya <girishji@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 17:01:57 +02:00
Girish Palya	fe1d3c8af7	patch 9.1.1539: completion: messages don't respect 'shm' setting Problem: completion: messages don't respect 'shm' setting Solution: Turn off completion messages when 'shortmess' includes "c" (Girish Palya). `:set shortmess+=c` is intended to reduce noise during completion by suppressing messages. Previously, some completion messages still appeared regardless of this setting. This change ensures that all completion-related messages are suppressed when `'c'` is present in `'shortmess'`. Not entirely sure if the original behavior was intentional. If there's a reason certain messages were always shown, feel free to close this without merging. closes: #17737 Signed-off-by: Girish Palya <girishji@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 16:53:53 +02:00
Doug Kearns	ce1d1969f3	runtime(vim): Update base syntax, improve :match highlighting - Match the range prefix separately as a count. - Match an explicit count of 1, rarely used but seen in the wild. - Allow whitespace between the count and command. closes: #17717 Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 09:05:23 +02:00
Antonio Giovanni Colombo	2ab4f907a2	translation(it): update Italian message translations Signed-off-by: Antonio Giovanni Colombo <azc100@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 08:31:33 +02:00
Christian Brabandt	59bd74ed4c	translation: include vim.pot in the repository Translators would like to work with the vim.pot file directly, without having to clone and potentially build vim. So let's include it. closes: #17734 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 08:26:57 +02:00
Zvezdan Petkovic	6f85cec4fb	runtime(python): update rendering of Unicode named literals in syntax script This change: * enforces that the alias starts with a letter * allows the other words in an alias to be separated by either a space or a hyphen, but not both or double separators * allows only a letter after space, possibly followed by letters or digits * allows both letters and digits after a hyphen Tested with: a = '\N{Cyrillic Small Letter Zhe} is pronounced as zh in pleasure' b = '\N{NO-BREAK SPACE} is needed here' # ... other tests here r = '\N{HENTAIGANA LETTER E-1} is a Japanese hiragana letter archaic ye' s = '\N{CUNEIFORM SIGN NU11 TENU} is a correction alias' t = '\N{RECYCLING SYMBOL FOR TYPE-1 PLASTICS} base shape is a triangle' print(a) print(b) print(r) print(s) print(t) The tests confirm the behavior and are selected from real Unicode tables/aliases to check these combinations based on the specification. fixes: #17323 closes: #17735 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-13 08:23:24 +02:00
RestorerZ	68ee1cf7de	translation(ru): Update messages translation closes: #17719 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-11 19:40:39 +02:00
zeertzjq	7306e8fcdb	tests: string options in gen_opt_test.vim not fully sorted Problem: tests: string options in gen_opt_test.vim aren't fully sorted. Solution: Sort the string options alphabetically. Also make description of 'maxsearchcount' start with lower-case for consistency with other options, update documentation for searchcount(). closes: #17720 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-11 19:17:07 +02:00
Christian Brabandt	41adebe572	check.vim: detect trailing whitespace Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 21:01:27 +02:00
RestorerZ	87406c33c7	runtime(help_ru): Update help_ru syntax script closes: #17718 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 20:52:18 +02:00
Doug Kearns	6ac2e4aa0a	runtime(vim): Update base syntax, improve function call highlighting - Match more function calls. - Contain function call syntax groups. - Improve differentiation between Ex commands and builtin functions with the same name. Remove special cases. Command modifiers are not currently well differentiated from functions. closes: #17712 Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 20:50:06 +02:00
Christian Brabandt	ea528a9482	patch 9.1.1537: helptoc: still some issues when markdown code blocks Problem: helptoc: still some issues when parsing markdown code blocks (VimWei) Solution: assign nextline to curline before starting the next loop iteration; when processing fenced code blocks, flip the skip_fence variable, update the test to be more comprehensive related: https://github.com/vim/vim/issues/17699#issuecomment-3055603968 closes: #17716 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 20:44:51 +02:00
Christian Brabandt	48d7f5b5a3	patch 9.1.1536: tests: test_plugin_comment uses wrong :Check command Problem: tests: test_plugin_comment.vim uses :CheckScreenDump check but doesn't actually use a screen dump. Solution: Use :CheckRunVimInTerminal instead, remove a few empty lines. test_plugin_comment.vim uses :CheckScreenDump to test for the screen dump feature in each single test case. However, since we are not actually using any screen dumps, it would be more correct to use :CheckRunVimInTerminal, since this is the actual command that we want to run. And instead of verifying this for each single test, let's just do it once when sourcing the file. While doing this, also remove some white spaces. closes: #17711 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 20:40:09 +02:00
Christian Brabandt	b7b7fa04bf	patch 9.1.1535: the maximum search count uses hard-coded value 99 Problem: The maximum search count uses a hard-coded value of 99 (Andres Monge, Joschua Kesper) Solution: Make it configurable using the 'maxsearchcount' option. related: #8855 fixes: #17527 closes: #17695 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 20:34:41 +02:00
Hirohito Higashi	bda2e4eb16	patch 9.1.1534: unnecessary code in tabpanel.c Problem: unnecessary code in tabpanel.c Solution: remove it (Hirohito Higashi) closes: #17713 Signed-off-by: Hirohito Higashi <h.east.727@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-10 20:16:14 +02:00
Christian Brabandt	6715b3510e	patch 9.1.1533: helptoc: does not handle code sections in markdown well Problem: helptoc: does not handle code sections in markdown well (VimWei) Solution: Skip over fenced code sections (lacygoill), add a test. fixes: #17699 closes: #17710 Co-authored-by: lagygoill <lacygoill@lacygoill.me> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 20:26:07 +02:00
Christian Brabandt	3987eac572	runtime(doc): clarify how ex ranges are adjusted when acting on folds closes: #17696 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 19:59:22 +02:00
RestorerZ	a46e9e45a9	translation(ru): update vim-ru according to patch 9.1.1485 closes: #17709 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 19:45:43 +02:00
RestorerZ	43855b7396	translation(ru): update vimtutor-ru man according to commit `5bbdd0b` closes: #17708 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 19:43:51 +02:00
RestorerZ	49b89bb172	translation(ru): Update main readme.ru.txt according to commit `2bfd1ee` closes: #17707 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 19:41:21 +02:00
zeertzjq	41ee98c3c5	runtime(filetype): fix incorrect pattern and break early - Using `\n` is incorrect, as result of getline() does not contain line breaks and only uses `\n` for NUL bytes. - Return when b:asmsyntax is set, like many other filetypes. closes: #17706 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 18:23:52 +02:00
Christian Brabandt	bda55df3b8	Revert "runtime(haskell): Add single quote to `iskeyword` in ftplugin (#8191 )" This reverts commit `5e6e4042b1`. related: #8191 Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-09 18:18:22 +02:00
Dimitry Ishenko	c4bca1de0b	patch 9.1.1532: termdebug: not enough ways to configure breakpoints Problem: termdebug: not enough ways to configure breakpoints Solution: add the termdebug_config['signs'] config setting, rework the termdebug test cases (Dimitry Ishenko) Allow to configure custom breakpoint signs so one can do something like this: ```vim let g:termdebug_config['signs'] = ['>1', '>2', '>3', '>4', '>5', '>6', '>7', '>8', '>9'] let g:termdebug_config['sign'] = '>>' ``` where the first 9 breakpoints will have their own signs and the rest will be the same (>>). While at it, rework the test for the termdebug plugin: - Added test for g:termdebug_config['signs']. - Added test for g:termdebug_config['sign']. - Moved test for g:termdebug_config['sign_decimal'] into Test_termdebug_basic() closes: #17694 Signed-off-by: Dimitry Ishenko <dimitry.ishenko@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-08 23:13:14 +02:00
Hirohito Higashi	8331310c06	patch 9.1.1531: confusing error with nested legacy function Problem: confusing error with nested legacy function (lacygoill) Solution: clarify error message E1117 with :def or :func (Hirohito Higashi) fixes: #17697 closes: #17702 Signed-off-by: Hirohito Higashi <h.east.727@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-08 23:07:21 +02:00
Christian Brabandt	1adada0158	patch 9.1.1530: Missing version change in v9.1.1529 Problem: Missing version change from v9.1.1529 Solution: Update version.c with latest patch Signed-off-by: Christian Brabandt <cb@256bit.org>	2025-07-08 23:04:36 +02:00