runtime(vim): Update base-syntax, match :loadkeymap after colon and bar
Commit:
https://github.com/vim/vim/commit/7866d54ecc7ff47d5f3c48bc389dfd85759b9b65
Author: Doug Kearns <dougkea...@gmail.com>
Date: Fri Aug 23 18:37:55 2024 +0200
runtime(vim): Update base-syntax, match :loadkeymap after colon and bar
Match :loadkeymap after Ex colons and bars.
Don't generate :loadkeymap as it is matched with a custom syntax group.
closes: #15554
Signed-off-by: Doug Kearns <dougkea...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/syntax/generator/gen_syntax_vim.vim
b/runtime/syntax/generator/gen_syntax_vim.vim
index f88792034..480038e82 100644
--- a/runtime/syntax/generator/gen_syntax_vim.vim
+++ b/runtime/syntax/generator/gen_syntax_vim.vim
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi (h_east)
" URL: https://github.com/vim-jp/syntax-vim-ex
-" Last Change: 2024 Aug 21
+" Last Change: 2024 Aug 23
" Version: 2.1.1
let s:keepcpo= &cpo
@@ -305,6 +305,7 @@ function! s:get_vim_command_type(cmd_name)
function
insert
let
+ loadkeymap
map
mapclear
match
diff --git a/runtime/syntax/generator/vim.vim.base
b/runtime/syntax/generator/vim.vim.base
index 4c91df416..2624798a5 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -185,7 +185,7 @@ syn match vimNumber '\%(^\|\A\)\zs#\x\{6}'
skipwhite nextgroup=vimGlobal,vimSub
syn case match
" All vimCommands are contained by vimIsCommand. {{{2
-syn cluster vimCmdList
contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDef,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimGlobal,vimHighlight,vimLet,vimMap,vimMark,vimMatch,vimNotFunc,vimNorm,vimSet,vimSleep,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate,@vim9CmdList
+syn cluster vimCmdList
contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDef,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimGlobal,vimHighlight,vimLet,vimLoadkeymap,vimMap,vimMark,vimMatch,vimNotFunc,vimNorm,vimSet,vimSleep,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate,@vim9CmdList
syn cluster vim9CmdList contains=vim9Const,vim9Final,vim9For,vim9Var
syn match vimCmdSep "[:|]\+" skipwhite
nextgroup=@vimCmdList,vimSubst1
syn match vimIsCommand "\<\%(\h\w*\|[23]mat\%[ch]\)\>" contains=vimCommand
@@ -347,7 +347,7 @@ else
endif
syn cluster vimKeymapLineComment contains=vim9\=KeymapLineComment
-syn region vimKeymap matchgroup=vimCommand start="\<loadk\%[eymap]\>"
end="\%$" contains=vimKeymapStart
+syn region vimLoadkeymap matchgroup=vimCommand start="\<loadk\%[eymap]\>"
end="\%$" contains=vimKeymapStart
" Special Filenames, Modifiers, Extension Removal: {{{2
" ===============================================
diff --git a/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
b/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
index 09e9dfac5..39040dc9f 100644
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
@@ -10,7 +10,7 @@
|:|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
-|:|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@63
+|#+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
|:|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@65
|:|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@64
|:|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@66
diff --git a/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
b/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
index 3dd9a7140..222222048 100644
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
@@ -3,7 +3,7 @@
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|f|i|l|e| +0#0000000&@60
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|f|i|l|e| +0#0000000&@60
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|o|r|e|m|a|p|
+0#0000000&@58
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|k|e|y|m|a|p|
+0#0000000&@56
+>#+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
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r|
+0#0000000&@59
diff --git a/runtime/syntax/testdir/dumps/vim9_keymap_00.dump
b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
similarity index 90%
rename from runtime/syntax/testdir/dumps/vim9_keymap_00.dump
rename to runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
index 121bef64d..9e6247a6c 100644
--- a/runtime/syntax/testdir/dumps/vim9_keymap_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
@@ -1,6 +1,6 @@
>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
@75
-|#+0#0000e05&| |V|i|m| |K|e|y|m|a|p| |f|i|l|e| |f|o|r| |s|y|n|t|a|x|
|t|e|s|t|i|n|g| +0#0000000&@38
+|#+0#0000e05&| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49
@75
|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g|
+0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
@75
diff --git a/runtime/syntax/testdir/dumps/vim9_keymap_01.dump
b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_keymap_01.dump
rename to runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
b/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
index ff5894c24..cd1fb6758 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
@@ -6,7 +6,7 @@
>:|l+0#af5f00255&|n|e|w|e|r| +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
-|:|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@63
+|"+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
|:|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@65
|:|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@64
|:|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@66
diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
b/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
index f85e7e540..c2052da58 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
@@ -1,6 +1,6 @@
|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||
|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@55
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||
|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||
|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@51
+|"+0#0000e05&| |c|a|l@1| |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&@21
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||
|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@53
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||
|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@52
>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||
>|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54
diff --git a/runtime/syntax/testdir/dumps/vim_keymap_00.dump
b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
similarity index 92%
rename from runtime/syntax/testdir/dumps/vim_keymap_00.dump
rename to runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
index 48e3a8792..bda8d791b 100644
--- a/runtime/syntax/testdir/dumps/vim_keymap_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
@@ -1,4 +1,4 @@
->"+0#0000e05#ffffff0| |V|i|m| |K|e|y|m|a|p| |f|i|l|e| |f|o|r| |s|y|n|t|a|x|
|t|e|s|t|i|n|g| +0#0000000&@38
+>"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d|
+0#0000000&@49
@75
|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g|
+0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
@75
diff --git a/runtime/syntax/testdir/dumps/vim_keymap_01.dump
b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_keymap_01.dump
rename to runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
new file mode 100644
index 000000000..664947534
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
@@ -0,0 +1,20 @@
+>"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d|
|(|a|f|t|e|r| |"+0#e000002&|||"|)+0#0000e05&| +0#0000000&@37
+@75
+|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g|
+0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
+@75
+|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e|
+0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"|
+0#0000000&@41
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&|||
|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@51
+@75
+|a| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| +0#0000000&@54
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
new file mode 100644
index 000000000..f0e5adc17
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
@@ -0,0 +1,20 @@
+>"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d|
|(|a|f|t|e|r| |"+0#e000002&|:|"|)+0#0000e05&| +0#0000000&@37
+@75
+|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g|
+0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
+@75
+|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e|
+0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"|
+0#0000000&@41
+@75
+|:|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@63
+@75
+|a| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| +0#0000000&@54
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1|
diff --git a/runtime/syntax/testdir/dumps/vim_keymap_02.dump
b/runtime/syntax/testdir/dumps/vim_keymap_02.dump
deleted file mode 100644
index 5d6a30c13..000000000
--- a/runtime/syntax/testdir/dumps/vim_keymap_02.dump
+++ /dev/null
@@ -1,20 +0,0 @@
-| +0&#ffffff0@74
-@75
-@75
-@75
-|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@64
-@75
-@75
-@75
-@75
-@75
-@75
-@45> @29
-|"+0#0000e05&| |L|i|n|e| |c|o|m@1|e|n|t| @60
-@60| +0#0000000&@14
-@75
-@75
-@2|"+0#0000e05&| |A|n|o|t|h|e|r| |l|i|n|e| |c|o|m@1|e|n|t| @15| +0#0000000&@34
-@75
-@75
-@57|1@1|,|2|7|1| @7|4|0|%|
diff --git a/runtime/syntax/testdir/dumps/vim_keymap_03.dump
b/runtime/syntax/testdir/dumps/vim_keymap_03.dump
deleted file mode 100644
index a07bfc405..000000000
--- a/runtime/syntax/testdir/dumps/vim_keymap_03.dump
+++ /dev/null
@@ -1,20 +0,0 @@
-| +0&#ffffff0@74
-@75
-|a| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| @38| +0#0000000&@15
-|'|a| |á| @2|M+0#0000e05&|o|r|e| |t|h|a|n| |o|n|e| |c|h|a|r| |i|n| |f|i|r|s|t|
|c|o|l|u|m|n| @10| +0#0000000&@22
-@75
->"+0#0000e05&| |S|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| @56
-@60| +0#0000000&@14
-|<+0#e000e06&|c|h|a|r|-|6|2|>| +0#0000000&@5|B| @14|S+0#0000e05&|p|e|c|i|a|l|
|n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |-| |d|e|c|i|m|a|l| @2
-@75
-@75
-@46| +0#0000000&@28
-|c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>|
+0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n|
|R|H|S| |-| |o|c|t|a|l| @4
-@60| +0#0000000&@14
-|<+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>|
+0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>|
+0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n|
|L|H|S| |a|n|d| |R|H|S| |-| |h|e
-|x|a|d|e|c|i|m|a|l| @50| +0#0000000&@14
-@75
-|"+0#0000e05&| |V|i|m|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| |c|h|a|r|a|c|t|e|r|s|
@30| +0#0000000&@12
-|#| |<+0#e000e06&|c|h|a|r|-|0|x|0@1|a|3|>| +0#0000000&@15|L+0#0000e05&|i|n|e|
|s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
-|n|t| +0#0000000&@72
-@57|1|9|,|1| @9|8|7|%|
diff --git a/runtime/syntax/testdir/dumps/vim_keymap_04.dump
b/runtime/syntax/testdir/dumps/vim_keymap_04.dump
deleted file mode 100644
index c0965eb0b..000000000
--- a/runtime/syntax/testdir/dumps/vim_keymap_04.dump
+++ /dev/null
@@ -1,20 +0,0 @@
-|#+0&#ffffff0| |<+0#e000e06&|c|h|a|r|-|0|x|0@1|a|3|>|
+0#0000000&@15|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
-|n|t| +0#0000000&@72
-|\|"| |“| @26|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
-@1|e|n|t| | +0#0000000&@69
->:| |"| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
-@1|e|n|t| +0#0000000&@70
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|2|7|,|1| @9|B|o|t|
diff --git a/runtime/syntax/testdir/input/vim9_ex_commands.vim
b/runtime/syntax/testdir/input/vim9_ex_commands.vim
index 028e68873..92ab9dc0d 100644
--- a/runtime/syntax/testdir/input/vim9_ex_commands.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_commands.vim
@@ -293,7 +293,7 @@ vim9script
:lnfile
:lNfile
:lnoremap
-:loadkeymap
+# :loadkeymap # disabled - runs until EOF
:loadview
:lockmarks
:lockvar
@@ -880,7 +880,7 @@ Foo() | lNext
Foo() | lnfile
Foo() | lNfile
Foo() | lnoremap
-Foo() | loadkeymap
+# Foo() | loadkeymap # disabled - runs until EOF
Foo() | loadview
Foo() | lockmarks
Foo() | lockvar
diff --git a/runtime/syntax/testdir/input/vim9_keymap.vim
b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
similarity index 95%
rename from runtime/syntax/testdir/input/vim9_keymap.vim
rename to runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
index 1c59e56ae..126c6dd38 100644
--- a/runtime/syntax/testdir/input/vim9_keymap.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
@@ -1,6 +1,6 @@
vim9script
-# Vim Keymap file for syntax testing
+# Vim :loadkeymap command
scriptencoding utf-8
diff --git a/runtime/syntax/testdir/input/vim_ex_commands.vim
b/runtime/syntax/testdir/input/vim_ex_commands.vim
index 6ed7b3eac..3d03ac371 100644
--- a/runtime/syntax/testdir/input/vim_ex_commands.vim
+++ b/runtime/syntax/testdir/input/vim_ex_commands.vim
@@ -289,7 +289,7 @@
:lnewer
:lnfile
:lnoremap
-:loadkeymap
+" :loadkeymap " disabled - runs until EOF
:loadview
:lockmarks
:lockvar
@@ -877,7 +877,7 @@ call Foo() | lnext
call Foo() | lnewer
call Foo() | lnfile
call Foo() | lnoremap
-call Foo() | loadkeymap
+" call Foo() | loadkeymap " disabled - runs until EOF
call Foo() | loadview
call Foo() | lockmarks
call Foo() | lockvar
diff --git a/runtime/syntax/testdir/input/vim_keymap.vim
b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
similarity index 94%
rename from runtime/syntax/testdir/input/vim_keymap.vim
rename to runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
index 029bc768a..8f4484db5 100644
--- a/runtime/syntax/testdir/input/vim_keymap.vim
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
@@ -1,4 +1,4 @@
-" Vim Keymap file for syntax testing
+" Vim :loadkeymap command
scriptencoding utf-8
diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
new file mode 100644
index 000000000..029af2cb3
--- /dev/null
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
@@ -0,0 +1,10 @@
+" Vim :loadkeymap command (after "|")
+
+scriptencoding utf-8
+
+let b:keymap_name = "syntax-test"
+
+echo "..." | loadkeymap
+
+a A Basic mapping
+
diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
new file mode 100644
index 000000000..61578b6a0
--- /dev/null
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
@@ -0,0 +1,10 @@
+" Vim :loadkeymap command (after ":")
+
+scriptencoding utf-8
+
+let b:keymap_name = "syntax-test"
+
+:loadkeymap
+
+a A Basic mapping
+
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 323aa7c59..2fa2e35db 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -30,10 +30,10 @@ syn cluster vimCommentGroup contains=vimTodo,@Spell
" GEN_SYN_VIM: vimCommand normal, START_STR='syn keyword vimCommand
contained', END_STR=''
syn keyword vimCommand contained abo[veleft] abs[tract] al[l] ar[gs] arga[dd]
argd[elete] argdo argded[upe] arge[dit] argg[lobal] argl[ocal] argu[ment]
as[cii] b[uffer] bN[ext] ba[ll] bad[d] balt bd[elete] bel[owright] bf[irst]
bl[ast] bm[odified] bn[ext] bo[tright] bp[revious] br[ewind] brea[k] breaka[dd]
breakd[el] breakl[ist] bro[wse] buffers bufd[o] bun[load] bw[ipeout] c[hange]
cN[ext] cNf[ile] cabo[ve] cad[dbuffer] cadde[xpr] caddf[ile] caf[ter] cb[uffer]
cbe[fore] cbel[ow] cbo[ttom] cc ccl[ose] cd cdo ce[nter] cex[pr] cf[ile] cfd[o]
cfir[st] cg[etfile] cgetb[uffer] cgete[xpr] chd[ir] changes che[ckpath]
checkt[ime] chi[story] cl[ist] cla[st] class clo[se] cle[arjumps] cn[ext]
cnew[er] cnf[ile] co[py] col[der] colo[rscheme] com[mand] comc[lear] comp[iler]
syn keyword vimCommand contained con[tinue] conf[irm] cons[t] cope[n]
cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] d[elete]
delm[arks] deb[ug] debugg[reedy] defc[ompile] defe[r] delc[ommand]
delf[unction] di[splay] dif[fupdate] diffg[et] diffo[ff] diffp[atch] diffpu[t]
diffs[plit] difft[his] dig[raphs] disa[ssemble] dj[ump] dli[st] dr[op]
ds[earch] dsp[lit] e[dit] ea[rlier] el[se] elsei[f] em[enu] en[dif]
endin[terface] endc[lass] ende[num] endfo[r] endt[ry] endw[hile] ene[w] enu[m]
ev[al] ex exi[t] exp[ort] exu[sage] f[ile] files filet[ype] filt[er] fin[d]
finall[y] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldd[oopen]
folddoc[losed] foldo[pen] g[lobal] go[to] gr[ep] grepa[dd] gu[i] gv[im] h[elp]
helpc[lose] helpf[ind] helpg[rep] helpt[ags]
-syn keyword vimCommand contained ha[rdcopy] hi[ghlight] hid[e] his[tory]
ho[rizontal] if ij[ump] il[ist] imp[ort] int[ro] inte[rface] is[earch] isp[lit]
j[oin] ju[mps] k kee[pmarks] keepj[umps] keepp[atterns] keepa[lt] l[ist]
lN[ext] lNf[ile] la[st] lab[ove] lan[guage] lad[dexpr] laddb[uffer] laddf[ile]
laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lc[d] lch[dir] lcl[ose]
lcs[cope] ld[o] le[ft] lefta[bove] lex[pr] leg[acy] lf[ile] lfd[o] lfir[st]
lg[etfile] lgetb[uffer] lgete[xpr] lgr[ep] lgrepa[dd] lh[elpgrep] lhi[story] ll
lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] loadk[eymap]
loc[kmarks] lockv[ar] lol[der] lop[en] lp[revious] lpf[ile] lr[ewind] lt[ag]
lua luad[o] luaf[ile] lv[imgrep] lvimgrepa[dd] lw[indow] ls m[ove] ma[rk] mak[e]
-syn keyword vimCommand contained marks menut[ranslate] mes[sages] mk[exrc]
mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] mz[scheme] mzf[ile] n[ext]
nb[key] nbc[lose] nbs[tart] noa[utocmd] noh[lsearch] nos[wapfile] nu[mber]
o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall]
pc[lose] pe[rl] perld[o] ped[it] po[p] pp[op] pre[serve] prev[ious]
pro[mptfind] promptr[epl] prof[ile] profd[el] ps[earch] pt[ag] ptN[ext]
ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t]
pub[lic] pw[d] py[thon] pyd[o] pyf[ile] py3 py3d[o] python3 py3f[ile] pyx
pyxd[o] pythonx pyxf[ile] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o]
redi[r] redr[aw] redraws[tatus] redrawt[abline] reg[isters] res[ize] ret[ab]
retu[rn] rew[ind] ri[ght]
-syn keyword vimCommand contained rightb[elow] ru[ntime] rub[y] rubyd[o]
rubyf[ile] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] san[dbox] sav[eas]
sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext]
sbp[revious] sbr[ewind] sc[riptnames] scripte[ncoding] scriptv[ersion]
scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] si[malt] sig[n] sil[ent]
sla[st] sn[ext] so[urce] sor[t] sp[lit] spe[llgood] spelld[ump] spelli[nfo]
spellr[epall] spellra[re] spellu[ndo] spellw[rong] spr[evious] sr[ewind] st[op]
sta[g] star[tinsert] startg[replace] startr[eplace] stat[ic] stopi[nsert]
stj[ump] sts[elect] sun[hide] sus[pend] sv[iew] sw[apname] synti[me] sync[bind]
smi[le] t tN[ext] ta[g] tags tab tabc[lose] tabd[o] tabe[dit] tabf[ind]
tabfir[st] tabm[ove] tabl[ast]
-syn keyword vimCommand contained tabn[ext] tabnew tabo[nly] tabp[revious]
tabN[ext] tabr[ewind] tabs tc[d] tch[dir] tcl tcld[o] tclf[ile] te[aroff]
ter[minal] tf[irst] thi[s] tj[ump] tl[ast] tn[ext] to[pleft] tp[revious]
tr[ewind] try ts[elect] ty[pe] u[ndo] undoj[oin] undol[ist] unh[ide]
unlo[ckvar] uns[ilent] up[date] v[global] ve[rsion] verb[ose] vert[ical]
vi[sual] vie[w] vim[grep] vimgrepa[dd] vim9[cmd] viu[sage] vne[w] vs[plit]
w[rite] wN[ext] wa[ll] wh[ile] wi[nsize] winc[md] wind[o] winp[os] wn[ext]
wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll] xr[estore] y[ank] z dl
dell delel deletl deletel dp dep delp delep deletp deletep a i
+syn keyword vimCommand contained ha[rdcopy] hi[ghlight] hid[e] his[tory]
ho[rizontal] if ij[ump] il[ist] imp[ort] int[ro] inte[rface] is[earch] isp[lit]
j[oin] ju[mps] k kee[pmarks] keepj[umps] keepp[atterns] keepa[lt] l[ist]
lN[ext] lNf[ile] la[st] lab[ove] lan[guage] lad[dexpr] laddb[uffer] laddf[ile]
laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lc[d] lch[dir] lcl[ose]
lcs[cope] ld[o] le[ft] lefta[bove] lex[pr] leg[acy] lf[ile] lfd[o] lfir[st]
lg[etfile] lgetb[uffer] lgete[xpr] lgr[ep] lgrepa[dd] lh[elpgrep] lhi[story] ll
lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] loc[kmarks]
lockv[ar] lol[der] lop[en] lp[revious] lpf[ile] lr[ewind] lt[ag] lua luad[o]
luaf[ile] lv[imgrep] lvimgrepa[dd] lw[indow] ls m[ove] ma[rk] mak[e] marks
menut[ranslate]
+syn keyword vimCommand contained mes[sages] mk[exrc] mks[ession] mksp[ell]
mkv[imrc] mkvie[w] mod[e] mz[scheme] mzf[ile] n[ext] nb[key] nbc[lose]
nbs[tart] noa[utocmd] noh[lsearch] nos[wapfile] nu[mber] o[pen] ol[dfiles]
on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall] pc[lose] pe[rl]
perld[o] ped[it] po[p] pp[op] pre[serve] prev[ious] pro[mptfind] promptr[epl]
prof[ile] profd[el] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast]
ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pub[lic] pw[d] py[thon]
pyd[o] pyf[ile] py3 py3d[o] python3 py3f[ile] pyx pyxd[o] pythonx pyxf[ile]
q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redi[r] redr[aw] redraws[tatus]
redrawt[abline] reg[isters] res[ize] ret[ab] retu[rn] rew[ind] ri[ght]
rightb[elow] ru[ntime]
+syn keyword vimCommand contained rub[y] rubyd[o] rubyf[ile] rund[o] rv[iminfo]
sN[ext] sa[rgument] sal[l] san[dbox] sav[eas] sb[uffer] sbN[ext] sba[ll]
sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] sbr[ewind] sc[riptnames]
scripte[ncoding] scriptv[ersion] scs[cope] setf[iletype] sf[ind] sfir[st]
sh[ell] si[malt] sig[n] sil[ent] sla[st] sn[ext] so[urce] sor[t] sp[lit]
spe[llgood] spelld[ump] spelli[nfo] spellr[epall] spellra[re] spellu[ndo]
spellw[rong] spr[evious] sr[ewind] st[op] sta[g] star[tinsert] startg[replace]
startr[eplace] stat[ic] stopi[nsert] stj[ump] sts[elect] sun[hide] sus[pend]
sv[iew] sw[apname] synti[me] sync[bind] smi[le] t tN[ext] ta[g] tags tab
tabc[lose] tabd[o] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext]
tabnew tabo[nly]
+syn keyword vimCommand contained tabp[revious] tabN[ext] tabr[ewind] tabs
tc[d] tch[dir] tcl tcld[o] tclf[ile] te[aroff] ter[minal] tf[irst] thi[s]
tj[ump] tl[ast] tn[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] ty[pe]
u[ndo] undoj[oin] undol[ist] unh[ide] unlo[ckvar] uns[ilent] up[date] v[global]
ve[rsion] verb[ose] vert[ical] vi[sual] vie[w] vim[grep] vimgrepa[dd] vim9[cmd]
viu[sage] vne[w] vs[plit] w[rite] wN[ext] wa[ll] wh[ile] wi[nsize] winc[md]
wind[o] winp[os] wn[ext] wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll]
xr[estore] y[ank] z dl dell delel deletl deletel dp dep delp delep deletp
deletep a i
" Lower priority for _new_ to distinguish constructors from the command.
syn match vimCommand contained "\<new\>(\@!"
@@ -223,7 +223,7 @@ syn match vimNumber '\%(^\|\A\)\zs#\x\{6}'
skipwhite nextgroup=vimGlobal,vimSub
syn case match
" All vimCommands are contained by vimIsCommand. {{{2
-syn cluster vimCmdList
contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDef,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimGlobal,vimHighlight,vimLet,vimMap,vimMark,vimMatch,vimNotFunc,vimNorm,vimSet,vimSleep,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate,@vim9CmdList
+syn cluster vimCmdList
contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDef,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimGlobal,vimHighlight,vimLet,vimLoadkeymap,vimMap,vimMark,vimMatch,vimNotFunc,vimNorm,vimSet,vimSleep,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate,@vim9CmdList
syn cluster vim9CmdList contains=vim9Const,vim9Final,vim9For,vim9Var
syn match vimCmdSep "[:|]\+" skipwhite
nextgroup=@vimCmdList,vimSubst1
syn match vimIsCommand "\<\%(\h\w*\|[23]mat\%[ch]\)\>" contains=vimCommand
@@ -385,7 +385,7 @@ else
endif
syn cluster vimKeymapLineComment contains=vim9\=KeymapLineComment
-syn region vimKeymap matchgroup=vimCommand start="\<loadk\%[eymap]\>"
end="\%$" contains=vimKeymapStart
+syn region vimLoadkeymap matchgroup=vimCommand start="\<loadk\%[eymap]\>"
end="\%$" contains=vimKeymapStart
" Special Filenames, Modifiers, Extension Removal: {{{2
" ===============================================
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1shXPT-003IHP-0k%40256bit.org.
