• R/O
  • SSH

vim: コミット

Mirror of the Vim source from https://github.com/vim/vim


コミットメタ情報

リビジョン99a602b27e0ee09f318522f554871f6bcba8db07 (tree)
日時2020-07-01 03:45:06
作者Bram Moolenaar <Bram@vim....>
コミッターBram Moolenaar

ログメッセージ

Runtime file updates

Commit: https://github.com/vim/vim/commit/e46a4405056276b4cbdacee76b11f85c8ea1830b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jun 30 20:38:27 2020 +0200

Runtime file updates

変更サマリ

差分

diff -r f49405905ef6 -r 99a602b27e0e runtime/doc/eval.txt
--- a/runtime/doc/eval.txt Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/doc/eval.txt Tue Jun 30 20:45:06 2020 +0200
@@ -1,4 +1,4 @@
1-*eval.txt* For Vim version 8.2. Last change: 2020 Jun 17
1+*eval.txt* For Vim version 8.2. Last change: 2020 Jun 30
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -157,7 +157,7 @@
157157
158158
159159 1.2 Function references ~
160- *Funcref* *E695* *E718*
160+ *Funcref* *E695* *E718*
161161 A Funcref variable is obtained with the |function()| function, the |funcref()|
162162 function or created with the lambda expression |expr-lambda|. It can be used
163163 in an expression in the place of a function name, before the parenthesis
@@ -2511,13 +2511,15 @@
25112511 List list of jump list items
25122512 getline({lnum}) String line {lnum} of current buffer
25132513 getline({lnum}, {end}) List lines {lnum} to {end} of current buffer
2514-getloclist({nr} [, {what}]) List list of location list items
2514+getloclist({nr}) List list of location list items
2515+getloclist({nr}, {what}) Dict get specific location list properties
25152516 getmarklist([{expr}]) List list of global/local marks
25162517 getmatches([{win}]) List list of current matches
25172518 getmousepos() Dict last known mouse position
25182519 getpid() Number process ID of Vim
25192520 getpos({expr}) List position of cursor, mark, etc.
2520-getqflist([{what}]) List list of quickfix items
2521+getqflist() List list of quickfix items
2522+getqflist({what}) Dict get specific quickfix list properties
25212523 getreg([{regname} [, 1 [, {list}]]])
25222524 String or List contents of a register
25232525 getreginfo([{regname}]) Dict information about a register
@@ -2756,12 +2758,15 @@
27562758 setenv({name}, {val}) none set environment variable
27572759 setfperm({fname}, {mode}) Number set {fname} file permissions to {mode}
27582760 setline({lnum}, {line}) Number set line {lnum} to {line}
2759-setloclist({nr}, {list} [, {action} [, {what}]])
2760- Number modify location list using {list}
2761+setloclist({nr}, {list} [, {action}])
2762+ Number modify location list using {list}
2763+setloclist({nr}, {list}, {action}, {what})
2764+ Number modify specific location list props
27612765 setmatches({list} [, {win}]) Number restore a list of matches
27622766 setpos({expr}, {list}) Number set the {expr} position to {list}
2763-setqflist({list} [, {action} [, {what}]])
2764- Number modify quickfix list using {list}
2767+setqflist({list} [, {action}]) Number modify quickfix list using {list}
2768+setqflist({list}, {action}, {what})
2769+ Number modify specific quickfix list props
27652770 setreg({n}, {v} [, {opt}]) Number set register to value and type
27662771 settabvar({nr}, {varname}, {val}) none set {varname} in tab page {nr} to {val}
27672772 settabwinvar({tabnr}, {winnr}, {varname}, {val})
@@ -3635,7 +3640,7 @@
36353640
36363641 *complete_info()*
36373642 complete_info([{what}])
3638- Returns a Dictionary with information about Insert mode
3643+ Returns a |Dictionary| with information about Insert mode
36393644 completion. See |ins-completion|.
36403645 The items are:
36413646 mode Current completion mode name string.
@@ -4862,7 +4867,7 @@
48624867 Without an argument information about all the buffers is
48634868 returned.
48644869
4865- When the argument is a Dictionary only the buffers matching
4870+ When the argument is a |Dictionary| only the buffers matching
48664871 the specified criteria are returned. The following keys can
48674872 be specified in {dict}:
48684873 buflisted include only listed buffers.
@@ -5393,7 +5398,7 @@
53935398 < To get lines from another buffer see |getbufline()|
53945399
53955400 getloclist({nr} [, {what}]) *getloclist()*
5396- Returns a list with all the entries in the location list for
5401+ Returns a |List| with all the entries in the location list for
53975402 window {nr}. {nr} can be the window number or the |window-ID|.
53985403 When {nr} is zero the current window is used.
53995404
@@ -5415,6 +5420,14 @@
54155420 |location-list-file-window| for more
54165421 details.
54175422
5423+ Returns an empty Dictionary if there is no location list for
5424+ the window {nr} or the window is not present.
5425+
5426+ Examples (See also |getqflist-examples|): >
5427+ :echo getloclist(3, {'all': 0})
5428+ :echo getloclist(5, {'filewinid': 0})
5429+
5430+
54185431 getmarklist([{expr}] *getmarklist()*
54195432 Without the {expr} argument returns a |List| with information
54205433 about all the global marks. |mark|
@@ -5459,7 +5472,7 @@
54595472 :unlet m
54605473 <
54615474 getmousepos() *getmousepos()*
5462- Returns a Dictionary with the last known position of the
5475+ Returns a |Dictionary| with the last known position of the
54635476 mouse. This can be used in a mapping for a mouse click or in
54645477 a filter of a popup window. The items are:
54655478 screenrow screen row
@@ -5679,12 +5692,12 @@
56795692
56805693 gettabinfo([{arg}]) *gettabinfo()*
56815694 If {arg} is not specified, then information about all the tab
5682- pages is returned as a List. Each List item is a Dictionary.
5695+ pages is returned as a |List|. Each List item is a |Dictionary|.
56835696 Otherwise, {arg} specifies the tab page number and information
56845697 about that one is returned. If the tab page does not exist an
56855698 empty List is returned.
56865699
5687- Each List item is a Dictionary with the following entries:
5700+ Each List item is a |Dictionary| with the following entries:
56885701 tabnr tab page number.
56895702 variables a reference to the dictionary with
56905703 tabpage-local variables
@@ -5712,7 +5725,7 @@
57125725 When {varname} is empty a dictionary with all window-local
57135726 variables is returned.
57145727 When {varname} is equal to "&" get the values of all
5715- window-local options in a Dictionary.
5728+ window-local options in a |Dictionary|.
57165729 Otherwise, when {varname} starts with "&" get the value of a
57175730 window-local option.
57185731 Note that {varname} must be the name without "w:".
@@ -5767,16 +5780,16 @@
57675780 GetWinnr()->gettagstack()
57685781
57695782 getwininfo([{winid}]) *getwininfo()*
5770- Returns information about windows as a List with Dictionaries.
5783+ Returns information about windows as a |List| with Dictionaries.
57715784
57725785 If {winid} is given Information about the window with that ID
5773- is returned, as a List with one item. If the window does not
5786+ is returned, as a |List| with one item. If the window does not
57745787 exist the result is an empty list.
57755788
57765789 Without {winid} information about all the windows in all the
57775790 tab pages is returned.
57785791
5779- Each List item is a Dictionary with the following entries:
5792+ Each List item is a |Dictionary| with the following entries:
57805793 botline last displayed buffer line
57815794 bufnr number of buffer in the window
57825795 height window height (excluding winbar)
@@ -5804,7 +5817,7 @@
58045817 GetWinnr()->getwininfo()
58055818
58065819 getwinpos([{timeout}]) *getwinpos()*
5807- The result is a List with two numbers, the result of
5820+ The result is a |List| with two numbers, the result of
58085821 |getwinposx()| and |getwinposy()| combined:
58095822 [x-pos, y-pos]
58105823 {timeout} can be used to specify how long to wait in msec for
@@ -5859,7 +5872,7 @@
58595872 'suffixes' affect the ordering of matches.
58605873 'wildignorecase' always applies.
58615874
5862- When {list} is present and it is |TRUE| the result is a List
5875+ When {list} is present and it is |TRUE| the result is a |List|
58635876 with all matching files. The advantage of using a List is,
58645877 you also get filenames containing newlines correctly.
58655878 Otherwise the result is a String and when there are several
@@ -5922,7 +5935,7 @@
59225935 one of the patterns in 'wildignore' will be skipped and
59235936 'suffixes' affect the ordering of matches.
59245937
5925- When {list} is present and it is |TRUE| the result is a List
5938+ When {list} is present and it is |TRUE| the result is a |List|
59265939 with all matching files. The advantage of using a List is, you
59275940 also get filenames containing newlines correctly. Otherwise
59285941 the result is a String and when there are several matches,
@@ -7281,7 +7294,7 @@
72817294
72827295 *max()*
72837296 max({expr}) Return the maximum value of all items in {expr}.
7284- {expr} can be a List or a Dictionary. For a Dictionary,
7297+ {expr} can be a |List| or a |Dictionary|. For a Dictionary,
72857298 it returns the maximum of all values in the Dictionary.
72867299 If {expr} is neither a List nor a Dictionary, or one of the
72877300 items in {expr} cannot be used as a Number this results in
@@ -7352,7 +7365,7 @@
73527365
73537366 < *min()*
73547367 min({expr}) Return the minimum value of all items in {expr}.
7355- {expr} can be a List or a Dictionary. For a Dictionary,
7368+ {expr} can be a |List| or a |Dictionary|. For a Dictionary,
73567369 it returns the minimum of all values in the Dictionary.
73577370 If {expr} is neither a List nor a Dictionary, or one of the
73587371 items in {expr} cannot be used as a Number this results in
@@ -8014,7 +8027,7 @@
80148027 If {expr} results in 1 then this entry will be added
80158028 to the list.
80168029 The entries "." and ".." are always excluded.
8017- Each time {expr} is evaluated |v:val| is set to a Dictionary
8030+ Each time {expr} is evaluated |v:val| is set to a |Dictionary|
80188031 of the entry.
80198032 When {expr} is a function the entry is passed as the argument.
80208033 For example, to get a list of files ending in ".txt": >
@@ -8263,7 +8276,7 @@
82638276 Without {end}: Remove the item at {idx} from |List| {list} and
82648277 return the item.
82658278 With {end}: Remove items from {idx} to {end} (inclusive) and
8266- return a List with these items. When {idx} points to the same
8279+ return a |List| with these items. When {idx} points to the same
82678280 item as {end} a list with one item is returned. When {end}
82688281 points to an item before {idx} this is an error.
82698282 See |list-index| for possible values of {idx} and {end}.
@@ -8400,7 +8413,7 @@
84008413 GetRow()->screenchar(col)
84018414
84028415 screenchars({row}, {col}) *screenchars()*
8403- The result is a List of Numbers. The first number is the same
8416+ The result is a |List| of Numbers. The first number is the same
84048417 as what |screenchar()| returns. Further numbers are
84058418 composing characters on top of the base character.
84068419 This is mainly to be used for testing.
@@ -8565,7 +8578,7 @@
85658578 without the "S" flag in 'shortmess'. This works even if
85668579 'shortmess' does contain the "S" flag.
85678580
8568- This returns a Dictionary. The dictionary is empty if the
8581+ This returns a |Dictionary|. The dictionary is empty if the
85698582 previous pattern was not set and "pattern" was not specified.
85708583
85718584 key type meaning ~
@@ -8647,7 +8660,7 @@
86478660 " search again
86488661 call searchcount()
86498662 <
8650- {options} must be a Dictionary. It can contain:
8663+ {options} must be a |Dictionary|. It can contain:
86518664 key type meaning ~
86528665 recompute |Boolean| if |TRUE|, recompute the count
86538666 like |n| or |N| was executed.
@@ -9186,10 +9199,12 @@
91869199 setreg({regname}, {value} [, {options}])
91879200 Set the register {regname} to {value}.
91889201 If {regname} is "" or "@", the unnamed register '"' is used.
9202+
91899203 {value} may be any value returned by |getreg()| or
91909204 |getreginfo()|, including a |List| or |Dict|.
91919205 If {options} contains "a" or {regname} is upper case,
91929206 then the value is appended.
9207+
91939208 {options} can also contain a register type specification:
91949209 "c" or "v" |characterwise| mode
91959210 "l" or "V" |linewise| mode
@@ -9220,7 +9235,7 @@
92209235 register: >
92219236 :let var_a = getreginfo()
92229237 :call setreg('a', var_a)
9223-< or:
9238+< or: >
92249239 :let var_a = getreg('a', 1, 1)
92259240 :let var_amode = getregtype('a')
92269241 ....
@@ -9697,13 +9712,13 @@
96979712 something is busy:
96989713 m halfway a mapping, :normal command, feedkeys() or
96999714 stuffed command
9700- o operator pending or waiting for a command argument,
9701- e.g. after |f|
9715+ o operator pending, e.g. after |d|
97029716 a Insert mode autocomplete active
97039717 x executing an autocommand
97049718 w blocked on waiting, e.g. ch_evalexpr(), ch_read() and
9705- ch_readraw() when reading json.
9706- S not triggering SafeState or SafeStateAgain
9719+ ch_readraw() when reading json
9720+ S not triggering SafeState or SafeStateAgain, e.g. after
9721+ |f| or a count
97079722 c callback invoked, including timer (repeats for
97089723 recursiveness up to "ccc")
97099724 s screen has scrolled for messages
@@ -9884,7 +9899,7 @@
98849899 List [item, item]
98859900 Dictionary {key: value, key: value}
98869901
9887- When a List or Dictionary has a recursive reference it is
9902+ When a |List| or |Dictionary| has a recursive reference it is
98889903 replaced by "[...]" or "{...}". Using eval() on the result
98899904 will then fail.
98909905
@@ -10175,7 +10190,7 @@
1017510190 :echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
1017610191
1017710192 synconcealed({lnum}, {col}) *synconcealed()*
10178- The result is a List with currently three items:
10193+ The result is a |List| with currently three items:
1017910194 1. The first item in the list is 0 if the character at the
1018010195 position {lnum} and {col} is not part of a concealable
1018110196 region, 1 if it is.
@@ -10220,7 +10235,7 @@
1022010235
1022110236 system({expr} [, {input}]) *system()* *E677*
1022210237 Get the output of the shell command {expr} as a string. See
10223- |systemlist()| to get the output as a List.
10238+ |systemlist()| to get the output as a |List|.
1022410239
1022510240 When {input} is given and is a string this string is written
1022610241 to a file and passed as stdin to the command. The string is
@@ -10482,7 +10497,7 @@
1048210497 returned.
1048310498 When {id} is omitted information about all timers is returned.
1048410499
10485- For each timer the information is stored in a Dictionary with
10500+ For each timer the information is stored in a |Dictionary| with
1048610501 these items:
1048710502 "id" the timer ID
1048810503 "time" time the timer was started with
@@ -10716,7 +10731,7 @@
1071610731 undo blocks.
1071710732
1071810733 The first item in the "entries" list is the oldest undo item.
10719- Each List item is a Dictionary with these items:
10734+ Each List item is a |Dictionary| with these items:
1072010735 "seq" Undo sequence number. Same as what appears in
1072110736 |:undolist|.
1072210737 "time" Timestamp when the change happened. Use
@@ -10928,7 +10943,7 @@
1092810943
1092910944 Returns zero for success, non-zero for failure.
1093010945
10931- {options} is a Dictionary with the following optional entries:
10946+ {options} is a |Dictionary| with the following optional entries:
1093210947 "vertical" When TRUE, the split is created vertically,
1093310948 like with |:vsplit|.
1093410949 "rightbelow" When TRUE, the split is made below or to the
@@ -12093,8 +12108,9 @@
1209312108 text...
1209412109 text...
1209512110 {endmarker}
12096- Set internal variable {var-name} to a List containing
12097- the lines of text bounded by the string {endmarker}.
12111+ Set internal variable {var-name} to a |List|
12112+ containing the lines of text bounded by the string
12113+ {endmarker}.
1209812114 {endmarker} must not contain white space.
1209912115 {endmarker} cannot start with a lower case character.
1210012116 The last line should end only with the {endmarker}
diff -r f49405905ef6 -r 99a602b27e0e runtime/doc/if_lua.txt
--- a/runtime/doc/if_lua.txt Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/doc/if_lua.txt Tue Jun 30 20:45:06 2020 +0200
@@ -1,4 +1,4 @@
1-*if_lua.txt* For Vim version 8.2. Last change: 2020 May 17
1+*if_lua.txt* For Vim version 8.2. Last change: 2020 Jun 28
22
33
44 VIM REFERENCE MANUAL by Luis Carvalho
diff -r f49405905ef6 -r 99a602b27e0e runtime/doc/tags
--- a/runtime/doc/tags Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/doc/tags Tue Jun 30 20:45:06 2020 +0200
@@ -3894,6 +3894,7 @@
38943894 E104 digraph.txt /*E104*
38953895 E1042 vim9.txt /*E1042*
38963896 E105 mbyte.txt /*E105*
3897+E1050 vim9.txt /*E1050*
38973898 E107 eval.txt /*E107*
38983899 E108 eval.txt /*E108*
38993900 E109 eval.txt /*E109*
@@ -10002,6 +10003,7 @@
1000210003 vim9-declarations usr_46.txt /*vim9-declarations*
1000310004 vim9-differences vim9.txt /*vim9-differences*
1000410005 vim9-export vim9.txt /*vim9-export*
10006+vim9-gotchas vim9.txt /*vim9-gotchas*
1000510007 vim9-import vim9.txt /*vim9-import*
1000610008 vim9-rationale vim9.txt /*vim9-rationale*
1000710009 vim9-scopes vim9.txt /*vim9-scopes*
diff -r f49405905ef6 -r 99a602b27e0e runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/doc/todo.txt Tue Jun 30 20:45:06 2020 +0200
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 8.2. Last change: 2020 Jun 21
1+*todo.txt* For Vim version 8.2. Last change: 2020 Jun 28
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -40,12 +40,31 @@
4040
4141 Include src/po/vim.pot ?
4242
43-See if resizing a terminal can be fixed.
44-
4543 Vim9 script:
44+- line continuation at script level:
45+ eval_to_string_skip(), test with :throw
46+ eval1_emsg(), pass "eap", test with :execute, :echomsg, :echoerr
47+ handle_subscript() - call_func_rettv() - get_func_tv()
48+ func(
49+ args arg)
50+ callers of get_func_tv():
51+ eval_func()
52+ ex_call()
53+ function arguments, test assert_equal() with lambda, test :function
54+ :import:
55+ others
56+ eval_index()
57+- test:
58+ [1,
59+ 2,
60+ 3]->Func()
61+
4662 Making everything work:
63+- "nr += 4" gives "already defined" error.
4764 - Error for "g:var: string = 'value'"
4865 - Make func()->append('$') work - value is last argument, not first. #6305
66+- in Vim9 script expressions are evaluated differently, not using a type.
67+ e.g. "'' == 0" does not give an error and evaluates to true.
4968 - possible memory leak in test_vim9_func through compile_nested_function.
5069 - memory leaks in test_vim9_expr
5170 - memory leaks in test_vim9_script
@@ -134,12 +153,6 @@
134153 - compile "expr" and "call" expression of a channel in channel_exe_cmd()?
135154
136155 Popup windows:
137-- With some sequence get get hidden finished terminal buffer. (#5768)
138- Cannot close popup terminal (#5744)
139- Buffer can't be wiped, gets status "aF". (#5764)
140- Is buf->nwindows incorrect?
141-- popup_clear() and popup_close() should close the terminal popup, and
142- make the buffer hidden. #5745
143156 - Cursor not updated before a redraw, making it jump. (#5943)
144157 - With terminal in popup, allow for popup_hide() to temporarily hide it.?
145158 - Fire some autocommand event after a new popup window was created and
@@ -274,6 +287,13 @@
274287 How about removing Atari MiNT support?
275288 src/Make_mint.mak, src/os_mint.h, matches with __MINT__
276289
290+Add the <=> (spaceship) operator and "cond ?< expr ?= expr ?> expr"
291+ replace this:
292+ let left = GetLeftFunc()
293+ let right = GetRightFunc()
294+ let res = left < right ? lower : left == right ? equal : upper
295+ by:
296+ let res = GetLeftFunc() <=> GetRightFunc() ?< lower ?= equal ?> upper
277297 Patch to make :q work with local arglist. (Christian Brabandt, #6286)
278298
279299 Patch to fix drawing error with DirectX. (James Grant, #5688)
@@ -495,9 +515,6 @@
495515 Would be nice to set tab-local values for 'diffexpr' and 'diffopt'. Use
496516 t:diffexpr_option t:diffopt_option? (#4782)
497517
498-v:register isn't reset early enough, may be used by next command.
499-(Andy Massimino, #5294, possible fix in #5305)
500-
501518 Internal diff doesn't handle binary file like external diff does. (Mike
502519 Williams, 2018 Oct 30)
503520
@@ -580,9 +597,6 @@
580597 Line numbers in profile are off when function was defined with ":execute".
581598 (Daniel Hahler, #4511)
582599
583-Add a way to create an empty, hidden buffer. Like doing ":new|hide".
584-":let buf = bufcreate('name')
585-
586600 Session file contains absolute paths when "curdir" is removed form
587601 'sessionoptions', making it impossible to have a session with a relative path.
588602 (#4450)
@@ -1199,8 +1213,8 @@
11991213 Screen updated delayed when using CTRL-O u in Insert mode.
12001214 (Barlik, #1191) Perhaps because status message?
12011215
1202-Implement named arguments for functions:
1203- func Foo(start, count = 1 all = 1)
1216+Implement named arguments for functions with optional arguments:
1217+ func Foo(start, count = 1, all = 1)
12041218 call Foo(12, all = 0)
12051219
12061220 Add a command to take a range of lines, filter them and put the output
@@ -1393,8 +1407,6 @@
13931407 ml_get errors when reloading file. (Chris Desjardins, 2016 Apr 19)
13941408 Also with latest version.
13951409
1396-Cannot delete a file with square brackets with delete(). (#696)
1397-
13981410 Completion for input() does not expand environment variables. (chdiza, 2016
13991411 Jul 25, #948)
14001412
@@ -1403,8 +1415,6 @@
14031415 Assume the system converts between the actual encoding of the filesystem to
14041416 the system encoding (usually utf-8).
14051417
1406-'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
1407-
14081418 MS-Windows: use WS_HIDE instead of SW_SHOWMINNOACTIVE in os_win32.c?
14091419 Otherwise task flickers in taskbar.
14101420
@@ -1416,8 +1426,6 @@
14161426 Second problem in #966: ins_compl_add_tv() uses get_dict_string() multiple
14171427 times, overwrites the one buffer. (Nikolay Pavlov, 2016 Aug 5)
14181428
1419-Possibly wrong value for seq_cur. (Florent Fayolle, 2016 May 15, #806)
1420-
14211429 Filetype plugin for awk. (Doug Kearns, 2016 Sep 5)
14221430
14231431 Patch to improve map documentation. Issue #799.
@@ -1436,8 +1444,6 @@
14361444 When doing "vi buf.md" a BufNew autocommand for *.md is not triggered.
14371445 Because of using the initial buffer? (Dun Peal, 2016 May 12)
14381446
1439-Add redrawtabline command. (Naruhiko Nishino, 2016 Jun 11)
1440-
14411447 Neovim patch for utfc_ptr2char_len() https://github.com/neovim/neovim/pull/4574
14421448 No test, needs some work to include.
14431449
@@ -1507,20 +1513,10 @@
15071513 Patch to avoid redrawing tabline when the popup menu is visible.
15081514 (Christian Brabandt, 2016 Jan 28)
15091515
1510-Patch to show search statistics. (Christian Brabandt, 2016 Jul 22)
1511-
15121516 When the CursorMovedI event triggers, and CTRL-X was typed, a script cannot
15131517 restore the mode properly. (Andrew Stewart, 2016 Apr 20)
15141518 Do not trigger the event?
15151519
1516-Using ":windo" to set options in all windows has the side effect that it
1517-changes the window layout and the current window. Make a variant that saves
1518-and restores. Use in the matchparen plugin.
1519-Perhaps we can use ":windo <restore> {cmd}"?
1520-Patch to add <restore> to :windo, :bufdo, etc. (Christian Brabandt, 2015 Jan
1521-6, 2nd message)
1522-Alternative: ":keeppos" command modifier: ":keeppos windo {cmd}".
1523-
15241520 Patch to fix display of listchars on the cursorline. (Nayuri Aohime, 2013)
15251521 Update suggested by Yasuhiro Matsumoto, 2014 Nov 25:
15261522 https://gist.github.com/presuku/d3d6b230b9b6dcfc0477
@@ -1549,10 +1545,6 @@
15491545
15501546 Comparing nested structures with "==" uses a different comparator than when
15511547 comparing individual items.
1552-Also, "'' == 0" evaluates to true, which isn't nice.
1553-Add "===" to have a strict comparison (type and value match).
1554-Add "==*" (?) to have a value match, but no automatic conversion, and v:true
1555-equals 1 and 1.0, v:false equals 0 and 0.0.?
15561548
15571549 Using uninitialized memory. (Dominique Pelle, 2015 Nov 4)
15581550
@@ -1723,8 +1715,6 @@
17231715
17241716 Problem with transparent and matchgroup. Issue #475
17251717
1726-Patch to add :arglocal and :arglists. (Marcin Szamotulski, 2014 Aug 6)
1727-
17281718 Spell files use a latin single quote. Unicode also has another single quote:
17291719 0x2019. (Ron Aaron, 2014 Apr 4)
17301720 New OpenOffice spell files support this with ICONV. But they are not
@@ -1751,8 +1741,11 @@
17511741 Problem with upwards search on Windows (works OK on Linux). (Brett Stahlman,
17521742 2014 Jun 8)
17531743
1754-Include a plugin manager with Vim? Neobundle seems to be the best currently.
1744+Include a plugin manager with Vim? vim-plug seems to be the best currently:
1745+https://github.com/junegunn/vim-plug.
17551746 Also Vundle: https://github.com/gmarik/vundle
1747+Or minpac: https://github.com/k-takata/minpac, since it leverages the builtin
1748+package feature.
17561749 Long message about this from ZyX, 2014 Mar 23. And following replies.
17571750 Also see http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html
17581751 User view:
@@ -1807,6 +1800,7 @@
18071800
18081801 Patch for XDG base directory support. (Jean François Bignolles, 2014 Mar 4)
18091802 Remark on the docs. Should not be a compile time feature. But then what?
1803+Also see #2034.
18101804
18111805 Completion of ":e" is ":earlier", should be ":edit". Complete to the matching
18121806 command instead of doing this alphabetically. (Mikel Jorgensen)
@@ -1868,6 +1862,10 @@
18681862
18691863 Exception caused by argument of return is not caught by try/catch.
18701864 (David Barnett, 2013 Nov 19)
1865+Bug in try/catch: return with invalid compare throws error that isn't caught.
1866+(ZyX, 2011 Jan 26)
1867+try/catch not working for argument of return. (Matt Wozniski, 2008 Sep 15)
1868+try/catch not working when inside a for loop. (ZyX, 2011 Jan 25)
18711869
18721870 Patch to fix that 'cedit' is recognized after :normal. (Christian Brabandt,
18731871 2013 Mar 19, later message)
@@ -1903,6 +1901,8 @@
19031901 a reboot.
19041902
19051903 patch to add "combine" flag to syntax commands. (so8res, 2012 Dec 6)
1904+Patch to add "combine" to :syntax, combines highlight attributes. (Nate
1905+Soares, 2012 Dec 3)
19061906
19071907 Syntax update problem in one buffer opened in two windows, bottom window is
19081908 not correctly updated. (Paul Harris, 2012 Feb 27)
@@ -2090,9 +2090,6 @@
20902090
20912091 Behavior of i" and a" text objects isn't logical. (Ben Fritz, 2013 Nov 19)
20922092
2093-Bug in try/catch: return with invalid compare throws error that isn't caught.
2094-(ZyX, 2011 Jan 26)
2095-
20962093 When setting a local option value from the global value, add a script ID that
20972094 indicates this, so that ":verbose set" can give a hint. Check with options in
20982095 the help file.
@@ -2281,9 +2278,6 @@
22812278 Requires configure check for localtime().
22822279 Use format year-month-day hr:min:sec.
22832280
2284-Patch to add "combine" to :syntax, combines highlight attributes. (Nate
2285-Soares, 2012 Dec 3)
2286-
22872281 Patch to make ":hi link" also take arguments. (Nate Soares, 2012 Dec 4)
22882282
22892283 Shell not recognized properly if it ends in "csh -f". (James Vega, 2009 Nov 3)
@@ -2478,6 +2472,9 @@
24782472
24792473 Consider making YankRing or something else that keeps a list of yanked text
24802474 part of standard Vim. The "1 to "9 registers are not sufficient.
2475+6 When yanking into the unnamed registers several times, somehow make the
2476+ previous contents also available (like it's done for deleting). What
2477+ register names to use? g"1, g"2, etc.?
24812478
24822479 After doing "su" $HOME can be the old user's home, thus ~root/file is not
24832480 correct. Don't use it in the swap file.
@@ -2684,10 +2681,6 @@
26842681 In the swapfile dialog, add a H(elp) option that gives more info about what
26852682 each choice does. Similar to ":help swap-exists-choices"
26862683
2687-try/catch not working for argument of return. (Matt Wozniski, 2008 Sep 15)
2688-
2689-try/catch not working when inside a for loop. (ZyX, 2011 Jan 25)
2690-
26912684 ":tab help" always opens a new tab, while ":help" re-uses an existing window.
26922685 Would be more consistent when an existing tab is re-used. (Tony Mechelynck)
26932686
@@ -3257,7 +3250,7 @@
32573250 ":grep" and ":helpgrep".
32583251 More generic solution: support a filter (e.g., by calling a function).
32593252 7 Add a command that goes back to the position from before jumping to the
3260- first quickfix location. ":cbefore"?
3253+ first quickfix location.
32613254
32623255 Vi incompatibility:
32633256 - Try new POSIX tests, made after my comments. (Geoff Clare, 2005 April 7)
@@ -3294,7 +3287,6 @@
32943287 7 The ":map" command output overwrites the command. Perhaps it should keep
32953288 the ":map" when it's used without arguments?
32963289 7 CTRL-L is not the end of a section? It is for Posix! Make it an option.
3297-7 Implement 'prompt' option. Init to off when stdin is not a tty.
32983290 7 Add a way to send an email for a crashed edit session. Create a file when
32993291 making changes (containing name of the swap file), delete it when writing
33003292 the file. Supply a program that can check for crashed sessions (either
@@ -3472,8 +3464,6 @@
34723464 Solaris 2.6. (Marley)
34733465 9 On Solaris: Using a "-geometry" argument, bigger than the window where Vim
34743466 is started from, causes empty lines below the cmdline. (raf)
3475-8 X11 GUI: When menu is disabled by excluding 'm' from 'guioptions', ALT key
3476- should not be used to trigger a menu (like the Win32 version).
34773467 8 When setting 'langmenu', it should be effective immediately. Store both
34783468 the English and the translated text in the menu structure. Re-generate
34793469 the translation when 'langmenu' has changed.
@@ -3512,10 +3502,6 @@
35123502 When the "+0+0" is omitted it works.
35133503 8 When starting an external command, and 'guipty' set, BS and DEL are mixed
35143504 up. Set erase character somehow?
3515-8 A dead circumflex followed by a space should give the '^' character
3516- (Rommel). Look how xterm does this.
3517- Also: Bednar has some code for dead key handling.
3518- Also: Nedit 5.0.2 with USE_XMIM does it right. (Gaya)
35193505 8 The compose key doesn't work properly (Cepas). Both for Win32 and X11.
35203506 7 The cursor in an inactive window should be hollow. Currently it's not
35213507 visible.
@@ -3612,17 +3598,8 @@
36123598
36133599
36143600 "Small" problems:
3615-- Can't disable terminal flow control, to enable the use of CTRL-S and
3616- CTRL-Q. Add an option for it?
36173601 - When using e_secure in do_one_cmd() mention the command being executed,
36183602 otherwise it's not clear where it comes from.
3619-- When the quickfix window is open and executing ":echo 'hello'" using the
3620- Command-line window, the text is immediately removed by the redrawing.
3621- (Michael Henry, 2008 Nov 1)
3622- Generic solution: When redrawing while there is a message on the
3623- cmdline, don't erase the display but draw over the existing text.
3624- Other solution, redraw after closing the cmdline window, before executing
3625- the command.
36263603 9 For Turkish vim_tolower() and vim_toupper() also need to use utf_
36273604 functions for characters below 0x80. (Sertacyildiz)
36283605 9 When the last edited file is a help file, using '0 in a new Vim doesn't
@@ -4082,8 +4059,6 @@
40824059 - Considering Hunspell 1.1.4:
40834060 What does MAXNGRAMSUGS do?
40844061 Is COMPLEXPREFIXES necessary when we have flags for affixes?
4085-- Support spelling words in CamelCase as if they were two separate words.
4086- Requires some option to enable it. (Timothy Knox)
40874062 - There is no Finnish spell checking file. For openoffice Voikko is now
40884063 used, which is based on Malaga: http://home.arcor.de/bjoern-beutel/malaga/
40894064 (Teemu Likonen)
@@ -4458,8 +4433,6 @@
44584433 7 Execute a function with standard option values. No need to save and
44594434 restore option values. Especially useful for new options. Problem: how
44604435 to avoid a performance penalty (esp. for string options)?
4461-8 Add referring to key options with "&t_xx". Both for "echo &t_xx" and
4462- ":let &t_xx =". Useful for making portable mappings.
44634436 - range for ":exec", pass it on to the executed command. (Webb)
44644437 8 ":{range}source": source the lines from the current file.
44654438 You can already yank lines and use :@" to execute them.
@@ -4690,8 +4663,6 @@
46904663 - Delete message after new command has been entered and have waited for key.
46914664 Perhaps after ten seconds?
46924665 - Make message history available in "msg" variables: msg1, msg2, .. msg9.
4693-8 When reading from stdin allow suppressing the "reading from stdin"
4694- message.
46954666 9 Check handling of overwriting of messages and delays:
46964667 Very wrong: errors while redrawing cause endless loop.
46974668 When switching to another file and screen scrolls because of the long
@@ -5979,9 +5950,6 @@
59795950 8 Add put command that overwrites existing text. Should also work for
59805951 blocks. Useful to move text around in a table. Works like using "R ^R r"
59815952 for every line.
5982-6 When yanking into the unnamed registers several times, somehow make the
5983- previous contents also available (like it's done for deleting). What
5984- register names to use? g"1, g"2, etc.?
59855953 - When appending to a register, also report the total resulting number of
59865954 lines. Or just say "99 more lines yanked", add the "more".
59875955 - When inserting a register in Insert mode with CTRL-R, don't insert comment
diff -r f49405905ef6 -r 99a602b27e0e runtime/doc/vim9.txt
--- a/runtime/doc/vim9.txt Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/doc/vim9.txt Tue Jun 30 20:45:06 2020 +0200
@@ -1,4 +1,4 @@
1-*vim9.txt* For Vim version 8.2. Last change: 2020 Jun 22
1+*vim9.txt* For Vim version 8.2. Last change: 2020 Jun 24
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -378,6 +378,49 @@
378378 In Vim9 script one can use "true" for v:true and "false" for v:false.
379379
380380
381+What to watch out for ~
382+ *vim9-gotchas*
383+Vim9 was designed to be closer to often used programming languages, but at the
384+same time tries to support the legacy Vim commands. Some compromises had to
385+be made. Here is a summary of what might be unexpected.
386+
387+Ex command ranges need to be prefixed with a colon. >
388+ -> " legacy Vim: shifts the previous line to the right
389+ ->func() " Vim9: method call
390+ :-> " Vim9: shifts the previous line to the right
391+
392+ %s/a/b " legacy Vim: substitute on all lines
393+ x = alongname
394+ % another " Vim9: line continuation without a backslash
395+ :%s/a/b " Vim9: substitute on all lines
396+
397+Functions defined with `:def` compile the whole function. Legacy functions
398+can bail out, and the following lines are not parsed: >
399+ func Maybe()
400+ if !has('feature')
401+ return
402+ endif
403+ use-feature
404+ endfunc
405+Vim9 functions are compiled as a whole: >
406+ def Maybe()
407+ if !has('feature')
408+ return
409+ endif
410+ use-feature " May give compilation error
411+ enddef
412+For a workaround, split it in two functions: >
413+ func Maybe()
414+ if has('feature')
415+ call MaybyInner()
416+ endif
417+ endfunc
418+ if has('feature')
419+ def MaybeInner()
420+ use-feature
421+ enddef
422+ endif
423+
381424 ==============================================================================
382425
383426 3. New style functions *fast-functions*
diff -r f49405905ef6 -r 99a602b27e0e runtime/filetype.vim
--- a/runtime/filetype.vim Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/filetype.vim Tue Jun 30 20:45:06 2020 +0200
@@ -1,7 +1,7 @@
11 " Vim support file to detect file types
22 "
33 " Maintainer: Bram Moolenaar <Bram@vim.org>
4-" Last Change: 2020 Jun 15
4+" Last Change: 2020 Jun 25
55
66 " Listen very carefully, I will say this only once
77 if exists("did_load_filetypes")
diff -r f49405905ef6 -r 99a602b27e0e runtime/syntax/neomuttrc.vim
--- a/runtime/syntax/neomuttrc.vim Tue Jun 30 19:00:05 2020 +0200
+++ b/runtime/syntax/neomuttrc.vim Tue Jun 30 20:45:06 2020 +0200
@@ -2,10 +2,10 @@
22 " Language: NeoMutt setup files
33 " Maintainer: Richard Russon <rich@flatcap.org>
44 " Previous Maintainer: Guillaume Brogi <gui-gui@netcourrier.com>
5-" Last Change: 2019-11-18
5+" Last Change: 2020-06-21
66 " Original version based on syntax/muttrc.vim
77
8-" This file covers NeoMutt 2019-11-02
8+" This file covers NeoMutt 2020-06-19
99
1010 " quit when a syntax file was already loaded
1111 if exists("b:current_syntax")
@@ -19,23 +19,22 @@
1919 setlocal isk=@,48-57,_,-
2020
2121 " handling optional variables
22-syntax match muttrcComment "^# .*$" contains=@Spell
23-syntax match muttrcComment "^#[^ ].*$"
24-syntax match muttrcComment "^#$"
25-syntax match muttrcComment "[^\\]#.*$"lc=1
22+syntax match muttrcComment "^# .*$" contains=@Spell
23+syntax match muttrcComment "^#[^ ].*$"
24+syntax match muttrcComment "^#$"
25+syntax match muttrcComment "[^\\]#.*$"lc=1
2626
2727 " Escape sequences (back-tick and pipe goes here too)
28-syntax match muttrcEscape +\\[#tnr"'Cc ]+
29-syntax match muttrcEscape +[`|]+
30-syntax match muttrcEscape +\\$+
28+syntax match muttrcEscape +\\[#tnr"'Cc ]+
29+syntax match muttrcEscape +[`|]+
30+syntax match muttrcEscape +\\$+
3131
3232 " The variables takes the following arguments
33-"syn match muttrcString contained "=\s*[^ #"'`]\+"lc=1 contains=muttrcEscape
34-syntax region muttrcString contained keepend start=+"+ms=e skip=+\\"+ end=+"+ contains=muttrcEscape,muttrcCommand,muttrcAction,muttrcShellString
35-syntax region muttrcString contained keepend start=+'+ms=e skip=+\\'+ end=+'+ contains=muttrcEscape,muttrcCommand,muttrcAction
33+syntax region muttrcString contained keepend start=+"+ms=e skip=+\\"+ end=+"+ contains=muttrcEscape,muttrcCommand,muttrcAction,muttrcShellString
34+syntax region muttrcString contained keepend start=+'+ms=e skip=+\\'+ end=+'+ contains=muttrcEscape,muttrcCommand,muttrcAction
3635 syntax match muttrcStringNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcString,muttrcStringNL
3736
38-syntax region muttrcShellString matchgroup=muttrcEscape keepend start=+`+ skip=+\\`+ end=+`+ contains=muttrcVarStr,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcCommand,muttrcVarDeprecatedStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad
37+syntax region muttrcShellString matchgroup=muttrcEscape keepend start=+`+ skip=+\\`+ end=+`+ contains=muttrcVarStr,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcCommand
3938
4039 syntax match muttrcRXChars contained /[^\\][][.*?+]\+/hs=s+1
4140 syntax match muttrcRXChars contained /[][|()][.*?+]*/
@@ -45,54 +44,53 @@
4544 " Why does muttrcRXString2 work with one \ when muttrcRXString requires two?
4645 syntax region muttrcRXString contained skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcRXChars
4746 syntax region muttrcRXString contained skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcRXChars
48-syntax region muttrcRXString contained skipwhite start=+[^ "'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXChars
47+syntax region muttrcRXString contained skipwhite start=+[^ "'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXChars
4948 " For some reason, skip refuses to match backslashes here...
5049 syntax region muttrcRXString contained matchgroup=muttrcRXChars skipwhite start=+\^+ end=+[^\\]\s+re=e-1 contains=muttrcRXChars
5150 syntax region muttrcRXString contained matchgroup=muttrcRXChars skipwhite start=+\^+ end=+$\s+ contains=muttrcRXChars
5251 syntax region muttrcRXString2 contained skipwhite start=+'+ skip=+\'+ end=+'+ contains=muttrcRXChars
5352 syntax region muttrcRXString2 contained skipwhite start=+"+ skip=+\"+ end=+"+ contains=muttrcRXChars
5453
55-" these must be kept synchronized with muttrcRXString, but are intended for
56-" muttrcRXHooks
54+" these must be kept synchronized with muttrcRXString, but are intended for muttrcRXHooks
5755 syntax region muttrcRXHookString contained keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
5856 syntax region muttrcRXHookString contained keepend skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
59-syntax region muttrcRXHookString contained keepend skipwhite start=+[^ "'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
57+syntax region muttrcRXHookString contained keepend skipwhite start=+[^ "'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
6058 syntax region muttrcRXHookString contained keepend skipwhite start=+\^+ end=+[^\\]\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
6159 syntax region muttrcRXHookString contained keepend matchgroup=muttrcRXChars skipwhite start=+\^+ end=+$\s+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
62-syntax match muttrcRXHookStringNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcRXHookString,muttrcRXHookStringNL
60+syntax match muttrcRXHookStringNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcRXHookString,muttrcRXHookStringNL
6361
6462 " these are exclusively for args lists (e.g. -rx pat pat pat ...)
65-syntax region muttrcRXPat contained keepend skipwhite start=+'+ skip=+\\'+ end=+'\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
66-syntax region muttrcRXPat contained keepend skipwhite start=+"+ skip=+\\"+ end=+"\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
67-syntax match muttrcRXPat contained /[^-'"#!]\S\+/ skipwhite contains=muttrcRXChars nextgroup=muttrcRXPat
68-syntax match muttrcRXDef contained "-rx\s\+" skipwhite nextgroup=muttrcRXPat
69-
70-syntax match muttrcSpecial +\(['"]\)!\1+
63+syntax region muttrcRXPat contained keepend skipwhite start=+'+ skip=+\\'+ end=+'\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
64+syntax region muttrcRXPat contained keepend skipwhite start=+"+ skip=+\\"+ end=+"\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
65+syntax match muttrcRXPat contained /[^-'"#!]\S\+/ skipwhite contains=muttrcRXChars nextgroup=muttrcRXPat
66+syntax match muttrcRXDef contained "-rx\s\+" skipwhite nextgroup=muttrcRXPat
7167
72-syntax match muttrcSetStrAssignment contained skipwhite /=\s*\%(\\\?\$\)\?[0-9A-Za-z_-]\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr contains=muttrcVariable,muttrcEscapedVariable
73-syntax region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*"+hs=s+1 end=+"+ skip=+\\"+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr contains=muttrcString
74-syntax region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*'+hs=s+1 end=+'+ skip=+\\'+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr contains=muttrcString
75-syntax match muttrcSetBoolAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr contains=muttrcVariable,muttrcEscapedVariable
76-syntax match muttrcSetBoolAssignment contained skipwhite /=\s*\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
77-syntax match muttrcSetBoolAssignment contained skipwhite /=\s*"\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
78-syntax match muttrcSetBoolAssignment contained skipwhite /=\s*'\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
79-syntax match muttrcSetQuadAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr contains=muttrcVariable,muttrcEscapedVariable
80-syntax match muttrcSetQuadAssignment contained skipwhite /=\s*\%(ask-\)\?\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
81-syntax match muttrcSetQuadAssignment contained skipwhite /=\s*"\%(ask-\)\?\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
82-syntax match muttrcSetQuadAssignment contained skipwhite /=\s*'\%(ask-\)\?\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
83-syntax match muttrcSetNumAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr contains=muttrcVariable,muttrcEscapedVariable
84-syntax match muttrcSetNumAssignment contained skipwhite /=\s*\d\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
85-syntax match muttrcSetNumAssignment contained skipwhite /=\s*"\d\+"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
86-syntax match muttrcSetNumAssignment contained skipwhite /=\s*'\d\+'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
68+syntax match muttrcSpecial +\(['"]\)!\1+
69+
70+syntax match muttrcSetStrAssignment contained skipwhite /=\s*\%(\\\?\$\)\?[0-9A-Za-z_-]\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
71+syntax region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*"+hs=s+1 end=+"+ skip=+\\"+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcString
72+syntax region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*'+hs=s+1 end=+'+ skip=+\\'+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcString
73+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
74+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
75+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*"\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
76+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*'\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
77+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
78+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*\%(ask-\)\?\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
79+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*"\%(ask-\)\?\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
80+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*'\%(ask-\)\?\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
81+syntax match muttrcSetNumAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
82+syntax match muttrcSetNumAssignment contained skipwhite /=\s*\d\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
83+syntax match muttrcSetNumAssignment contained skipwhite /=\s*"\d\+"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
84+syntax match muttrcSetNumAssignment contained skipwhite /=\s*'\d\+'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
8785
8886 " Now catch some email addresses and headers (purified version from mail.vim)
89-syntax match muttrcEmail "[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
90-syntax match muttrcHeader "\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
87+syntax match muttrcEmail "[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
88+syntax match muttrcHeader "\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
9189
9290 syntax match muttrcKeySpecial contained +\%(\\[Cc'"]\|\^\|\\[01]\d\{2}\)+
93-syntax match muttrcKey contained "\S\+" contains=muttrcKeySpecial,muttrcKeyName
94-syntax region muttrcKey contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=muttrcKeySpecial,muttrcKeyName
95-syntax region muttrcKey contained start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=muttrcKeySpecial,muttrcKeyName
91+syntax match muttrcKey contained "\S\+" contains=muttrcKeySpecial,muttrcKeyName
92+syntax region muttrcKey contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=muttrcKeySpecial,muttrcKeyName
93+syntax region muttrcKey contained start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=muttrcKeySpecial,muttrcKeyName
9694 syntax match muttrcKeyName contained "\\[trne]"
9795 syntax match muttrcKeyName contained "\c<\%(BackSpace\|BackTab\|Delete\|Down\|End\|Enter\|Esc\|Home\|Insert\|Left\|Next\|PageDown\|PageUp\|Return\|Right\|Space\|Tab\|Up\)>"
9896 syntax match muttrcKeyName contained "\c<F\d\+>"
@@ -103,90 +101,84 @@
103101 syntax match muttrcStrftimeEscapes contained /%E[cCxXyY]/
104102 syntax match muttrcStrftimeEscapes contained /%O[BdeHImMSuUVwWy]/
105103
106-syntax region muttrcIndexFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
107-syntax region muttrcIndexFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
108-syntax region muttrcGroupIndexFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcGroupIndexFormatEscapes,muttrcGroupIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
109-syntax region muttrcGroupIndexFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcGroupIndexFormatEscapes,muttrcGroupIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
110-syntax region muttrcSidebarFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSidebarFormatEscapes,muttrcSidebarFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
111-syntax region muttrcSidebarFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSidebarFormatEscapes,muttrcSidebarFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
112-syntax region muttrcQueryFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcQueryFormatEscapes,muttrcQueryFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
113-syntax region muttrcAliasFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAliasFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
114-syntax region muttrcAliasFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAliasFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
115-syntax region muttrcAttachFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
116-syntax region muttrcAttachFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
117-syntax region muttrcComposeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcComposeFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
118-syntax region muttrcComposeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcComposeFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
119-syntax region muttrcFolderFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
120-syntax region muttrcFolderFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
121-syntax region muttrcMixFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
122-syntax region muttrcMixFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
123-syntax region muttrcPGPFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
124-syntax region muttrcPGPFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
125-syntax region muttrcPGPCmdFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
126-syntax region muttrcPGPCmdFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
127-syntax region muttrcStatusFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
128-syntax region muttrcStatusFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
129-syntax region muttrcPGPGetKeysFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPGetKeysFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
130-syntax region muttrcPGPGetKeysFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPGetKeysFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
131-syntax region muttrcSmimeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
132-syntax region muttrcSmimeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
133-syntax region muttrcStrftimeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStrftimeEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
134-syntax region muttrcStrftimeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStrftimeEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
104+syntax region muttrcAliasFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAliasFormatEscapes,muttrcAliasFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
105+syntax region muttrcAliasFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAliasFormatEscapes,muttrcAliasFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
106+syntax region muttrcAttachFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
107+syntax region muttrcAttachFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
108+syntax region muttrcComposeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcComposeFormatEscapes,muttrcComposeFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
109+syntax region muttrcComposeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcComposeFormatEscapes,muttrcComposeFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
110+syntax region muttrcFolderFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
111+syntax region muttrcFolderFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
112+syntax region muttrcGroupIndexFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcGroupIndexFormatEscapes,muttrcGroupIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
113+syntax region muttrcGroupIndexFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcGroupIndexFormatEscapes,muttrcGroupIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
114+syntax region muttrcIndexFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
115+syntax region muttrcIndexFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
116+syntax region muttrcMixFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
117+syntax region muttrcMixFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
118+syntax region muttrcPGPCmdFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
119+syntax region muttrcPGPCmdFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
120+syntax region muttrcPGPFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
121+syntax region muttrcPGPFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
122+syntax region muttrcQueryFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcQueryFormatEscapes,muttrcQueryFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
123+syntax region muttrcQueryFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcQueryFormatEscapes,muttrcQueryFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
124+syntax region muttrcSidebarFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSidebarFormatEscapes,muttrcSidebarFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
125+syntax region muttrcSidebarFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSidebarFormatEscapes,muttrcSidebarFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
126+syntax region muttrcSmimeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
127+syntax region muttrcSmimeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
128+syntax region muttrcStatusFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
129+syntax region muttrcStatusFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
130+syntax region muttrcStrftimeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStrftimeEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
131+syntax region muttrcStrftimeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStrftimeEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
135132
136133 " Format escapes and conditionals
137134 syntax match muttrcFormatConditionals2 contained /[^?]*?/
138-function! s:escapesConditionals(baseName, sequence, alignment, secondary)
135+function! s:escapesConditionals(baseName, sequence, padding, conditional)
139136 exec 'syntax match muttrc' . a:baseName . 'Escapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?\%(' . a:sequence . '\|%\)/'
140- if a:alignment
137+ if a:padding
141138 exec 'syntax match muttrc' . a:baseName . 'Escapes contained /%[>|*]./'
142139 endif
143- if a:secondary
140+ if a:conditional
144141 exec 'syntax match muttrc' . a:baseName . 'Conditionals contained /%?\%(' . a:sequence . '\)?/ nextgroup=muttrcFormatConditionals2'
145142 else
146143 exec 'syntax match muttrc' . a:baseName . 'Conditionals contained /%?\%(' . a:sequence . '\)?/'
147144 endif
148145 endfunction
149146
150-" CHECKED 2019-11-18
151-" Ref: index_format_str() in hdrline.c
152-call s:escapesConditionals('IndexFormat', '[AaBbCDdEeFfgHIiJKLlMmNnOPqRrSsTtuvWXxYyZ(<[{]\|G[a-zA-Z]\+\|Fp\=\|z[cst]\|cr\=', 1, 1)
153-" Ref: alias_format_str() in addrbook.c
154-syntax match muttrcAliasFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[afnrt%]/
155-" Ref: group_index_format_str() in browser.c
156-call s:escapesConditionals('GroupIndexFormat', '[CdfMNns]', 1, 1)
157-" Ref: sidebar_format_str() in sidebar.c
158-call s:escapesConditionals('SidebarFormat', '[!BDdFLNnSt]', 1, 1)
159-" Ref: query_format_str() in query.c
160-call s:escapesConditionals('QueryFormat', '[acent]', 0, 1)
147+" CHECKED 2020-06-21
148+" Ref: alias_format_str() in alias/dlgalias.c
149+call s:escapesConditionals('AliasFormat', '[acfnrt]', 1, 0)
161150 " Ref: attach_format_str() in recvattach.c
162151 call s:escapesConditionals('AttachFormat', '[CcDdeFfIMmnQsTtuX]', 1, 1)
163152 " Ref: compose_format_str() in compose.c
164-syntax match muttrcComposeFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[ahlv%]/
165-syntax match muttrcComposeFormatEscapes contained /%[>|*]./
153+call s:escapesConditionals('ComposeFormat', '[ahlv]', 1, 1)
166154 " Ref: folder_format_str() in browser.c
167155 call s:escapesConditionals('FolderFormat', '[CDdFfgilmNnstu]', 1, 0)
156+" Ref: group_index_format_str() in browser.c
157+call s:escapesConditionals('GroupIndexFormat', '[CdfMNns]', 1, 1)
158+" Ref: index_format_str() in hdrline.c
159+call s:escapesConditionals('IndexFormat', '[AaBbCDdEefgHIiJKLlMmNnOPqRrSsTtuvWXxYyZ(<[{]\|@\i\+@\|G[a-zA-Z]\+\|Fp\=\|z[cst]\|cr\=', 1, 1)
168160 " Ref: mix_format_str() in remailer.c
169-call s:escapesConditionals('MixFormat', '[acns]', 0, 0)
161+call s:escapesConditionals('MixFormat', '[acns]', 1, 0)
162+" Ref: pgp_command_format_str() in ncrypt/pgpinvoke.c
163+call s:escapesConditionals('PGPCmdFormat', '[afprs]', 0, 1)
164+" Ref: crypt_format_str() in ncrypt/crypt_gpgme.c
165+" Ref: pgp_entry_format_str() in ncrypt/pgpkey.c
166+" Note: crypt_format_str() supports 'p', but pgp_entry_fmt() does not
167+call s:escapesConditionals('PGPFormat', '[AaCcFfKkLlnptu[]', 0, 0)
168+" Ref: query_format_str() in alias/dlgquery.c
169+call s:escapesConditionals('QueryFormat', '[acent]', 1, 1)
170+" Ref: sidebar_format_str() in sidebar.c
171+call s:escapesConditionals('SidebarFormat', '[!BDdFLNnorStZ]', 1, 1)
172+" Ref: smime_command_format_str() in ncrypt/smime.c
173+call s:escapesConditionals('SmimeFormat', '[aCcdfiks]', 0, 1)
170174 " Ref: status_format_str() in status.c
171175 call s:escapesConditionals('StatusFormat', '[bDdFfhLlMmnoPpRrSstuVv]', 1, 1)
172-" Ref: fmt_smime_command() in ncrypt/smime.c
173-call s:escapesConditionals('SmimeFormat', '[aCcdfiks]', 0, 1)
174-" Ref: crypt_format_str() in ncrypt/crypt_gpgme.c
175-" Ref: pgp_entry_fmt() in ncrypt/pgpkey.c
176-" Note: crypt_format_str() supports 'p', but pgp_entry_fmt() does not
177-call s:escapesConditionals('PGPFormat', '[AaCcFfKkLlnptu[]', 0, 0)
178-" Ref: fmt_pgp_command() ncrypt/pgpinvoke.c
179-call s:escapesConditionals('PGPCmdFormat', '[afprs]', 0, 1)
180176
181-" This matches the documentation, but directly contradicts the code
182-" (according to the code, this should be identical to the muttrcPGPCmdFormatEscapes
183-syntax match muttrcPGPGetKeysFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[acfklntu[%]/
184-
185-syntax region muttrcTimeEscapes contained start=+%{+ end=+}+ contains=muttrcStrftimeEscapes
186-syntax region muttrcTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
187-syntax region muttrcTimeEscapes contained start=+%(+ end=+)+ contains=muttrcStrftimeEscapes
188-syntax region muttrcTimeEscapes contained start=+%<+ end=+>+ contains=muttrcStrftimeEscapes
189177 syntax region muttrcPGPTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
178+syntax region muttrcTimeEscapes contained start=+%(+ end=+)+ contains=muttrcStrftimeEscapes
179+syntax region muttrcTimeEscapes contained start=+%<+ end=+>+ contains=muttrcStrftimeEscapes
180+syntax region muttrcTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
181+syntax region muttrcTimeEscapes contained start=+%{+ end=+}+ contains=muttrcStrftimeEscapes
190182
191183 syntax match muttrcVarEqualsAliasFmt contained skipwhite "=" nextgroup=muttrcAliasFormatStr
192184 syntax match muttrcVarEqualsAttachFmt contained skipwhite "=" nextgroup=muttrcAttachFormatStr
@@ -197,29 +189,20 @@
197189 syntax match muttrcVarEqualsMixFmt contained skipwhite "=" nextgroup=muttrcMixFormatStr
198190 syntax match muttrcVarEqualsPGPCmdFmt contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr
199191 syntax match muttrcVarEqualsPGPFmt contained skipwhite "=" nextgroup=muttrcPGPFormatStr
200-syntax match muttrcVarEqualsPGPGetKeysFmt contained skipwhite "=" nextgroup=muttrcPGPGetKeysFormatStr
201192 syntax match muttrcVarEqualsQueryFmt contained skipwhite "=" nextgroup=muttrcQueryFormatStr
202193 syntax match muttrcVarEqualsSdbFmt contained skipwhite "=" nextgroup=muttrcSidebarFormatStr
203194 syntax match muttrcVarEqualsSmimeFmt contained skipwhite "=" nextgroup=muttrcSmimeFormatStr
204195 syntax match muttrcVarEqualsStatusFmt contained skipwhite "=" nextgroup=muttrcStatusFormatStr
205196 syntax match muttrcVarEqualsStrftimeFmt contained skipwhite "=" nextgroup=muttrcStrftimeFormatStr
206197
207-syntax match muttrcVPrefix contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
198+syntax match muttrcVPrefix contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
208199
209-" CHECKED 2019-11-02
200+" CHECKED 2020-06-21
210201 " List of the different screens in mutt (see Menus in keymap.c)
211202 syntax keyword muttrcMenu contained alias attach browser compose editor generic index key_select_pgp key_select_smime mix pager pgp postpone query smime
212203 syntax match muttrcMenuList "\S\+" contained contains=muttrcMenu
213204 syntax match muttrcMenuCommas /,/ contained
214205
215-" CHECKED 2019-11-02
216-" List of hooks in Commands in init.h
217-syntax keyword muttrcHooks contained skipwhite
218- \ account-hook append-hook close-hook crypt-hook fcc-hook fcc-save-hook
219- \ folder-hook iconv-hook index-format-hook mbox-hook message-hook open-hook pgp-hook
220- \ reply-hook save-hook send-hook send2-hook
221-syntax keyword muttrcHooks skipwhite shutdown-hook startup-hook timeout-hook nextgroup=muttrcCommand
222-
223206 syntax region muttrcSpamPattern contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
224207 syntax region muttrcSpamPattern contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
225208
@@ -251,15 +234,19 @@
251234 syntax match muttrcBadAction contained "[^<>]\+" contains=muttrcEmail
252235 syntax match muttrcAction contained "<[^>]\{-}>" contains=muttrcBadAction,muttrcFunction,muttrcKeyName
253236
237+" CHECKED 2020-06-21
254238 " First, functions that take regular expressions:
255239 syntax match muttrcRXHookNot contained /!\s*/ skipwhite nextgroup=muttrcRXHookString,muttrcRXHookStringNL
256240 syntax match muttrcRXHooks /\<\%(account\|append\|close\|crypt\|folder\|mbox\|open\|pgp\)-hook\>/ skipwhite nextgroup=muttrcRXHookNot,muttrcRXHookString,muttrcRXHookStringNL
257241
258242 " Now, functions that take patterns
259243 syntax match muttrcPatHookNot contained /!\s*/ skipwhite nextgroup=muttrcPattern
260-syntax match muttrcPatHooks /\<\%(charset\|iconv\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcPattern
244+syntax match muttrcPatHooks /\<\%(charset\|iconv\|index-format\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcPattern
261245 syntax match muttrcPatHooks /\<\%(message\|reply\|send\|send2\|save\|fcc\|fcc-save\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcOptPattern
262246
247+" Global hooks that take a command
248+syntax keyword muttrcHooks skipwhite shutdown-hook startup-hook timeout-hook nextgroup=muttrcCommand
249+
263250 syntax match muttrcBindFunction contained /\S\+\>/ skipwhite contains=muttrcFunction
264251 syntax match muttrcBindFunctionNL contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindFunction,muttrcBindFunctionNL
265252 syntax match muttrcBindKey contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcBindFunction,muttrcBindFunctionNL
@@ -272,8 +259,8 @@
272259 syntax region muttrcMacroDescr contained keepend skipwhite start=+"+ms=e skip=+\\"+ end=+"+me=s
273260 syntax match muttrcMacroDescrNL contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
274261 syntax region muttrcMacroBody contained skipwhite start="\S" skip='\\ \|\\$' end=' \|$' contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcCommand,muttrcAction nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
275-syntax region muttrcMacroBody matchgroup=Type contained skipwhite start=+'+ms=e skip=+\\'+ end=+'\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
276-syntax region muttrcMacroBody matchgroup=Type contained skipwhite start=+"+ms=e skip=+\\"+ end=+"\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
262+syntax region muttrcMacroBody matchgroup=Type contained skipwhite start=+'+ms=e skip=+\\'+ end=+'\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
263+syntax region muttrcMacroBody matchgroup=Type contained skipwhite start=+"+ms=e skip=+\\"+ end=+"\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
277264 syntax match muttrcMacroBodyNL contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroBody,muttrcMacroBodyNL
278265 syntax match muttrcMacroKey contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcMacroBody,muttrcMacroBodyNL
279266 syntax match muttrcMacroKeyNL contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroKey,muttrcMacroKeyNL
@@ -283,7 +270,7 @@
283270 syntax match muttrcAddrContent contained "[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+\s*" skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
284271 syntax region muttrcAddrContent contained start=+'+ end=+'\s*+ skip=+\\'+ skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
285272 syntax region muttrcAddrContent contained start=+"+ end=+"\s*+ skip=+\\"+ skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
286-syntax match muttrcAddrDef contained "-addr\s\+" skipwhite nextgroup=muttrcAddrContent
273+syntax match muttrcAddrDef contained "-addr\s\+" skipwhite nextgroup=muttrcAddrContent
287274
288275 syntax match muttrcGroupFlag contained "-group"
289276 syntax region muttrcGroupDef contained start="-group\s\+" skip="\\$" end="\s" skipwhite keepend contains=muttrcGroupFlag,muttrcUnHighlightSpace
@@ -308,20 +295,29 @@
308295 syntax match muttrcUnAliasKey contained "\s*\w\+\s*" skipwhite nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
309296 syntax match muttrcUnAliasNL contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
310297
311-syntax match muttrcSimplePat contained "!\?\^\?[~][ADEFgGklNOpPQRSTuUvV=$]"
298+" CHECKED 2020-06-21
299+" List of letters in Flags in pattern.c
300+" Parameter: none
301+syntax match muttrcSimplePat contained "!\?\^\?[~][ADEFGgklNOPpQRSTuUvV#$=]"
302+" Parameter: range
312303 syntax match muttrcSimplePat contained "!\?\^\?[~][mnXz]\s*\%([<>-][0-9]\+[kM]\?\|[0-9]\+[kM]\?[-]\%([0-9]\+[kM]\?\)\?\)"
304+" Parameter: date
313305 syntax match muttrcSimplePat contained "!\?\^\?[~][dr]\s*\%(\%(-\?[0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)*\)\|\%(\%([0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)*\)-\%([0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)\?\)\?\)\|\%([<>=][0-9]\+[ymwd]\)\|\%(`[^`]\+`\)\|\%(\$[a-zA-Z0-9_-]\+\)\)" contains=muttrcShellString,muttrcVariable
314-syntax match muttrcSimplePat contained "!\?\^\?[~][bBcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatRXContainer
306+" Parameter: regex
307+syntax match muttrcSimplePat contained "!\?\^\?[~][BbCcefHhIiLMstwxYy]\s*" nextgroup=muttrcSimplePatRXContainer
308+" Parameter: pattern
315309 syntax match muttrcSimplePat contained "!\?\^\?[%][bBcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString
310+" Parameter: pattern
316311 syntax match muttrcSimplePat contained "!\?\^\?[=][bcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString
317312 syntax region muttrcSimplePat contained keepend start=+!\?\^\?[~](+ end=+)+ contains=muttrcSimplePat
313+
318314 "syn match muttrcSimplePat contained /'[^~=%][^']*/ contains=muttrcRXString
319315 syntax region muttrcSimplePatString contained keepend start=+"+ end=+"+ skip=+\\"+
320316 syntax region muttrcSimplePatString contained keepend start=+'+ end=+'+ skip=+\\'+
321-syntax region muttrcSimplePatString contained keepend start=+[^ "']+ skip=+\\ + end=+\s+re=e-1
317+syntax region muttrcSimplePatString contained keepend start=+[^ "']+ skip=+\\ + end=+\s+re=e-1
322318 syntax region muttrcSimplePatRXContainer contained keepend start=+"+ end=+"+ skip=+\\"+ contains=muttrcRXString
323319 syntax region muttrcSimplePatRXContainer contained keepend start=+'+ end=+'+ skip=+\\'+ contains=muttrcRXString
324-syntax region muttrcSimplePatRXContainer contained keepend start=+[^ "']+ skip=+\\ + end=+\s+re=e-1 contains=muttrcRXString
320+syntax region muttrcSimplePatRXContainer contained keepend start=+[^ "']+ skip=+\\ + end=+\s+re=e-1 contains=muttrcRXString
325321 syntax match muttrcSimplePatMetas contained /[(|)]/
326322
327323 syntax match muttrcOptSimplePat contained skipwhite /[~=%!(^].*/ contains=muttrcSimplePat,muttrcSimplePatMetas
@@ -350,12 +346,12 @@
350346 syntax match muttrcColor contained "\<\%(bright\)\=color\d\{1,3}\>"
351347 " Now for the structure of the color line
352348 syntax match muttrcColorRXNL contained skipnl "\s*\\$" nextgroup=muttrcColorRXPat,muttrcColorRXNL
353-syntax match muttrcColorBG contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorRXPat,muttrcColorRXNL
349+syntax match muttrcColorBG contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorRXPat,muttrcColorRXNL
354350 syntax match muttrcColorBGNL contained skipnl "\s*\\$" nextgroup=muttrcColorBG,muttrcColorBGNL
355-syntax match muttrcColorFG contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorBG,muttrcColorBGNL
351+syntax match muttrcColorFG contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorBG,muttrcColorBGNL
356352 syntax match muttrcColorFGNL contained skipnl "\s*\\$" nextgroup=muttrcColorFG,muttrcColorFGNL
357-syntax match muttrcColorContext contained /\s*[$]\?\w\+/ contains=muttrcColorField,muttrcVariable,muttrcUnHighlightSpace,muttrcColorCompose nextgroup=muttrcColorFG,muttrcColorFGNL
358-syntax match muttrcColorNL contained skipnl "\s*\\$" nextgroup=muttrcColorContext,muttrcColorNL,muttrcColorCompose
353+syntax match muttrcColorContext contained /\s*[$]\?\w\+/ contains=muttrcColorField,muttrcVariable,muttrcUnHighlightSpace,muttrcColorCompose nextgroup=muttrcColorFG,muttrcColorFGNL
354+syntax match muttrcColorNL contained skipnl "\s*\\$" nextgroup=muttrcColorContext,muttrcColorNL,muttrcColorCompose
359355 syntax match muttrcColorKeyword contained /^\s*color\s\+/ nextgroup=muttrcColorContext,muttrcColorNL,muttrcColorCompose
360356 " And now color's brother:
361357 syntax region muttrcUnColorPatterns contained skipwhite start=+\s*'+ end=+'+ skip=+\\'+ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
@@ -373,25 +369,25 @@
373369 syntax keyword muttrcMono contained mono skipwhite nextgroup=muttrcColorField,muttrcColorCompose
374370 syntax match muttrcMonoLine "^\s*mono\s\+\S\+" skipwhite nextgroup=muttrcMonoAttrib contains=muttrcMono
375371
376-" CHECKED 2019-11-02
372+" CHECKED 2020-06-21
377373 " List of fields in Fields in color.c
378374 syntax keyword muttrcColorField skipwhite contained
379- \ attachment attach_headers body bold error hdrdefault header index
380- \ index_author index_collapsed index_date index_flags index_label
381- \ index_number index_size index_subject index_tag index_tags indicator
382- \ markers message normal options progress prompt quoted search sidebar_divider
383- \ sidebar_flagged sidebar_highlight sidebar_indicator sidebar_new
384- \ sidebar_ordinary sidebar_spoolfile sidebar_unread signature status tilde tree
385- \ underline warning nextgroup=muttrcColor
375+ \ attachment attach_headers body bold error hdrdefault header index index_author
376+ \ index_collapsed index_date index_flags index_label index_number index_size index_subject
377+ \ index_tag index_tags indicator markers message normal options progress prompt quoted
378+ \ search sidebar_divider sidebar_flagged sidebar_highlight sidebar_indicator sidebar_new
379+ \ sidebar_ordinary sidebar_spoolfile sidebar_unread signature status tilde tree underline
380+ \ warning nextgroup=muttrcColor
381+
386382 syntax match muttrcColorField contained "\<quoted\d\=\>"
387383
388384 syntax match muttrcColorCompose skipwhite contained /\s*compose\s*/ nextgroup=muttrcColorComposeField
389385
390-" CHECKED 2019-11-02
386+" CHECKED 2020-06-21
391387 " List of fields in ComposeFields in color.c
392388 syntax keyword muttrcColorComposeField skipwhite contained
393- \ header security_both security_encrypt security_none security_sign
394- \ nextgroup=muttrcColorFG,muttrcColorFGNL
389+ \ header security_both security_encrypt security_none security_sign
390+ \ nextgroup=muttrcColorFG,muttrcColorFGNL
395391 syntax region muttrcColorLine keepend start=/^\s*color\s\+/ skip=+\\$+ end=+$+ contains=muttrcColorKeyword,muttrcComment,muttrcUnHighlightSpace
396392
397393 function! s:boolQuadGen(type, vars, deprecated)
@@ -403,673 +399,459 @@
403399 let l:orig_type = copy(a:type)
404400 if a:deprecated
405401 let l:type = 'Deprecated' . a:type
402+ exec 'syntax keyword muttrcVar' . l:type . ' ' . join(a:vars)
403+ exec 'syntax keyword muttrcVar' . l:type . ' ' . join(l:novars)
404+ exec 'syntax keyword muttrcVar' . l:type . ' ' . join(l:invvars)
406405 else
407406 let l:type = a:type
407+ exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(a:vars) . ' nextgroup=muttrcSet' . l:orig_type . 'Assignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr'
408+ exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:novars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr'
409+ exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:invvars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr'
408410 endif
409411
410- exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(a:vars) . ' nextgroup=muttrcSet' . l:orig_type . 'Assignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr'
411- exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:novars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr'
412- exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:invvars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr'
413412 endfunction
414413
415-" CHECKED 2019-11-02
416-" List of DT_BOOL in MuttVars in init.h
414+" CHECKED 2020-06-21
415+" List of DT_BOOL in MuttVars in mutt_config.c
417416 call s:boolQuadGen('Bool', [
418- \ 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'askbcc',
419- \ 'askcc', 'ask_follow_up', 'ask_x_comment_to', 'attach_split', 'autoedit',
420- \ 'auto_tag', 'beep', 'beep_new', 'bounce_delivered', 'braille_friendly',
421- \ 'change_folder_next', 'check_mbox_size', 'check_new', 'collapse_all',
422- \ 'collapse_flagged', 'collapse_unread', 'confirmappend', 'confirmcreate',
423- \ 'crypt_autoencrypt', 'crypt_autopgp', 'crypt_autosign', 'crypt_autosmime',
424- \ 'crypt_confirmhook', 'crypt_opportunistic_encrypt', 'crypt_replyencrypt',
425- \ 'crypt_replysign', 'crypt_replysignencrypted', 'crypt_timestamp',
426- \ 'crypt_use_gpgme', 'crypt_use_pka', 'delete_untag', 'digest_collapse',
427- \ 'duplicate_threads', 'edit_headers', 'encode_from', 'fast_reply',
428- \ 'fcc_clear', 'flag_safe', 'followup_to', 'force_name', 'forward_decode',
429- \ 'forward_decrypt', 'forward_quote', 'forward_references', 'hdrs',
430- \ 'header', 'header_cache_compress', 'header_color_partial', 'help',
431- \ 'hidden_host', 'hide_limited', 'hide_missing', 'hide_thread_subject',
432- \ 'hide_top_limited', 'hide_top_missing', 'history_remove_dups',
433- \ 'honor_disposition', 'idn_decode', 'idn_encode', 'ignore_list_reply_to',
434- \ 'imap_check_subscribed', 'imap_idle', 'imap_list_subscribed',
435- \ 'imap_passive', 'imap_peek', 'imap_servernoise', 'implicit_autoview',
436- \ 'include_onlyfirst', 'keep_flagged', 'mailcap_sanitize',
437- \ 'maildir_check_cur', 'maildir_header_cache_verify', 'maildir_trash',
438- \ 'mail_check_recent', 'mail_check_stats', 'markers', 'mark_old',
439- \ 'menu_move_off', 'menu_scroll', 'message_cache_clean', 'meta_key',
440- \ 'metoo', 'mh_purge', 'mime_forward_decode', 'mime_subject',
441- \ 'mime_type_query_first', 'narrow_tree', 'nm_record', 'nntp_listgroup',
442- \ 'nntp_load_description', 'pager_stop', 'pgp_autoinline',
443- \ 'pgp_auto_decode', 'pgp_check_exit', 'pgp_ignore_subkeys', 'pgp_long_ids',
444- \ 'pgp_replyinline', 'pgp_retainable_sigs', 'pgp_self_encrypt',
445- \ 'pgp_show_unusable', 'pgp_strict_enc', 'pgp_use_gpg_agent', 'pipe_decode',
446- \ 'pipe_split', 'pop_auth_try_all', 'pop_last', 'postpone_encrypt',
447- \ 'print_decode', 'print_split', 'prompt_after', 'read_only',
448- \ 'reflow_space_quotes', 'reflow_text', 'reply_self', 'reply_with_xorig',
449- \ 'resolve', 'resume_draft_files', 'resume_edited_draft_files',
450- \ 'reverse_alias', 'reverse_name', 'reverse_realname', 'rfc2047_parameters',
451- \ 'save_address', 'save_empty', 'save_name', 'save_unsubscribed', 'score',
452- \ 'show_new_news', 'show_only_unread', 'sidebar_folder_indent',
453- \ 'sidebar_new_mail_only', 'sidebar_next_new_wrap', 'sidebar_on_right',
454- \ 'sidebar_short_path', 'sidebar_visible', 'sig_dashes', 'sig_on_top',
455- \ 'smart_wrap', 'smime_ask_cert_label', 'smime_decrypt_use_default_key',
456- \ 'smime_is_default', 'smime_self_encrypt', 'sort_re', 'ssl_force_tls',
457- \ 'ssl_usesystemcerts', 'ssl_use_sslv2', 'ssl_use_sslv3', 'ssl_use_tlsv1',
458- \ 'ssl_use_tlsv1_1', 'ssl_use_tlsv1_2', 'ssl_verify_dates',
459- \ 'ssl_verify_host', 'ssl_verify_partial_chains', 'status_on_top',
460- \ 'strict_threads', 'suspend', 'text_flowed', 'thorough_search',
461- \ 'thread_received', 'tilde', 'ts_enabled', 'uncollapse_jump',
462- \ 'uncollapse_new', 'user_agent', 'use_8bitmime', 'use_domain',
463- \ 'use_envelope_from', 'use_from', 'use_ipv6', 'virtual_spoolfile',
464- \ 'wait_key', 'weed', 'wrap_search', 'write_bcc', 'x_comment_to',
465- \ 'attach_save_without_prompting', 'autocrypt', 'autocrypt_reply',
466- \ 'auto_subscribe', 'browser_abbreviate_mailboxes',
467- \ 'crypt_protected_headers_read', 'crypt_protected_headers_save',
468- \ 'crypt_protected_headers_write', 'fcc_before_send', 'imap_condstore',
469- \ 'imap_qresync', 'imap_rfc5161', 'include_encrypted',
470- \ 'pgp_check_gpg_decrypt_status_fd', 'sidebar_non_empty_mailbox_only',
471- \ 'size_show_bytes', 'size_show_fractions', 'size_show_mb',
472- \ 'size_units_on_left', 'ssl_use_tlsv1_3'
473- \ ], 0)
417+ \ 'abort_backspace', 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'askbcc',
418+ \ 'askcc', 'ask_follow_up', 'ask_x_comment_to', 'attach_save_without_prompting',
419+ \ 'attach_split', 'autocrypt', 'autocrypt_reply', 'autoedit', 'auto_subscribe', 'auto_tag',
420+ \ 'beep', 'beep_new', 'bounce_delivered', 'braille_friendly',
421+ \ 'browser_abbreviate_mailboxes', 'change_folder_next', 'check_mbox_size', 'check_new',
422+ \ 'collapse_all', 'collapse_flagged', 'collapse_unread', 'confirmappend', 'confirmcreate',
423+ \ 'crypt_autoencrypt', 'crypt_autopgp', 'crypt_autosign', 'crypt_autosmime',
424+ \ 'crypt_confirmhook', 'crypt_opportunistic_encrypt',
425+ \ 'crypt_opportunistic_encrypt_strong_keys', 'crypt_protected_headers_read',
426+ \ 'crypt_protected_headers_save', 'crypt_protected_headers_write', 'crypt_replyencrypt',
427+ \ 'crypt_replysign', 'crypt_replysignencrypted', 'crypt_timestamp', 'crypt_use_gpgme',
428+ \ 'crypt_use_pka', 'delete_untag', 'digest_collapse', 'duplicate_threads', 'edit_headers',
429+ \ 'encode_from', 'fast_reply', 'fcc_before_send', 'fcc_clear', 'flag_safe', 'followup_to',
430+ \ 'force_name', 'forward_decode', 'forward_decrypt', 'forward_quote', 'forward_references',
431+ \ 'hdrs', 'header', 'header_color_partial', 'help', 'hidden_host', 'hide_limited',
432+ \ 'hide_missing', 'hide_thread_subject', 'hide_top_limited', 'hide_top_missing',
433+ \ 'history_remove_dups', 'honor_disposition', 'idn_decode', 'idn_encode',
434+ \ 'ignore_list_reply_to', 'imap_check_subscribed', 'imap_condstore', 'imap_deflate',
435+ \ 'imap_idle', 'imap_list_subscribed', 'imap_passive', 'imap_peek', 'imap_qresync',
436+ \ 'imap_rfc5161', 'imap_servernoise', 'implicit_autoview', 'include_encrypted',
437+ \ 'include_onlyfirst', 'keep_flagged', 'mailcap_sanitize', 'maildir_check_cur',
438+ \ 'maildir_header_cache_verify', 'maildir_trash', 'mail_check_recent', 'mail_check_stats',
439+ \ 'markers', 'mark_old', 'menu_move_off', 'menu_scroll', 'message_cache_clean', 'meta_key',
440+ \ 'metoo', 'mh_purge', 'mime_forward_decode', 'mime_subject', 'mime_type_query_first',
441+ \ 'narrow_tree', 'nm_record', 'nntp_listgroup', 'nntp_load_description', 'pager_stop',
442+ \ 'pgp_autoinline', 'pgp_auto_decode', 'pgp_check_exit', 'pgp_check_gpg_decrypt_status_fd',
443+ \ 'pgp_ignore_subkeys', 'pgp_long_ids', 'pgp_replyinline', 'pgp_retainable_sigs',
444+ \ 'pgp_self_encrypt', 'pgp_show_unusable', 'pgp_strict_enc', 'pgp_use_gpg_agent',
445+ \ 'pipe_decode', 'pipe_split', 'pop_auth_try_all', 'pop_last', 'postpone_encrypt',
446+ \ 'print_decode', 'print_split', 'prompt_after', 'read_only', 'reflow_space_quotes',
447+ \ 'reflow_text', 'reply_self', 'reply_with_xorig', 'resolve', 'resume_draft_files',
448+ \ 'resume_edited_draft_files', 'reverse_alias', 'reverse_name', 'reverse_realname',
449+ \ 'rfc2047_parameters', 'save_address', 'save_empty', 'save_name', 'save_unsubscribed',
450+ \ 'score', 'show_new_news', 'show_only_unread', 'sidebar_folder_indent',
451+ \ 'sidebar_new_mail_only', 'sidebar_next_new_wrap', 'sidebar_non_empty_mailbox_only',
452+ \ 'sidebar_on_right', 'sidebar_short_path', 'sidebar_visible', 'sig_dashes', 'sig_on_top',
453+ \ 'size_show_bytes', 'size_show_fractions', 'size_show_mb', 'size_units_on_left',
454+ \ 'smart_wrap', 'smime_ask_cert_label', 'smime_decrypt_use_default_key', 'smime_is_default',
455+ \ 'smime_self_encrypt', 'sort_re', 'ssl_force_tls', 'ssl_usesystemcerts', 'ssl_use_sslv2',
456+ \ 'ssl_use_sslv3', 'ssl_use_tlsv1', 'ssl_use_tlsv1_1', 'ssl_use_tlsv1_2', 'ssl_use_tlsv1_3',
457+ \ 'ssl_verify_dates', 'ssl_verify_host', 'ssl_verify_partial_chains', 'status_on_top',
458+ \ 'strict_threads', 'suspend', 'text_flowed', 'thorough_search', 'thread_received', 'tilde',
459+ \ 'ts_enabled', 'uncollapse_jump', 'uncollapse_new', 'user_agent', 'use_8bitmime',
460+ \ 'use_domain', 'use_envelope_from', 'use_from', 'use_ipv6', 'virtual_spoolfile',
461+ \ 'wait_key', 'weed', 'wrap_search', 'write_bcc', 'x_comment_to'
462+ \ ], 0)
474463
475-" CHECKED 2019-11-02
464+" CHECKED 2020-06-21
476465 " Deprecated Bools
477-" List of DT_SYNONYM synonyms of Bools in MuttVars in init.h
466+" List of DT_SYNONYM or DT_DEPRECATED Bools in MuttVars in mutt_config.c
478467 call s:boolQuadGen('Bool', [
479- \ 'edit_hdrs', 'envelope_from', 'forw_decode', 'forw_decrypt',
480- \ 'forw_quote', 'ignore_linear_white_space', 'pgp_autoencrypt',
481- \ 'pgp_autosign', 'pgp_auto_traditional', 'pgp_create_traditional',
482- \ 'pgp_replyencrypt', 'pgp_replysign', 'pgp_replysignencrypted',
483- \ 'xterm_set_titles'
484- \ ], 1)
468+ \ 'edit_hdrs', 'envelope_from', 'forw_decode', 'forw_decrypt', 'forw_quote',
469+ \ 'header_cache_compress', 'ignore_linear_white_space', 'pgp_autoencrypt', 'pgp_autosign',
470+ \ 'pgp_auto_traditional', 'pgp_create_traditional', 'pgp_replyencrypt', 'pgp_replysign',
471+ \ 'pgp_replysignencrypted', 'xterm_set_titles'
472+ \ ], 1)
485473
486-" CHECKED 2019-11-02
487-" List of DT_QUAD in MuttVars in init.h
474+" CHECKED 2020-06-21
475+" List of DT_QUAD in MuttVars in mutt_config.c
488476 call s:boolQuadGen('Quad', [
489- \ 'abort_noattach', 'abort_nosubject', 'abort_unmodified', 'bounce',
490- \ 'catchup_newsgroup', 'copy', 'crypt_verify_sig', 'delete', 'fcc_attach',
491- \ 'followup_to_poster', 'forward_edit', 'honor_followup_to', 'include',
492- \ 'mime_forward', 'mime_forward_rest', 'move', 'pgp_mime_auto',
493- \ 'pop_delete', 'pop_reconnect', 'postpone', 'post_moderated', 'print',
494- \ 'quit', 'recall', 'reply_to', 'ssl_starttls', 'forward_attachments'
495- \ ], 0)
477+ \ 'abort_noattach', 'abort_nosubject', 'abort_unmodified', 'bounce', 'catchup_newsgroup',
478+ \ 'copy', 'crypt_verify_sig', 'delete', 'fcc_attach', 'followup_to_poster',
479+ \ 'forward_attachments', 'forward_edit', 'honor_followup_to', 'include', 'mime_forward',
480+ \ 'mime_forward_rest', 'move', 'pgp_mime_auto', 'pop_delete', 'pop_reconnect', 'postpone',
481+ \ 'post_moderated', 'print', 'quit', 'recall', 'reply_to', 'ssl_starttls',
482+ \ ], 0)
496483
497-" CHECKED 2019-11-02
484+" CHECKED 2020-06-21
498485 " Deprecated Quads
499-" List of DT_SYNONYM synonyms of Quads in MuttVars in init.h
486+" List of DT_SYNONYM or DT_DEPRECATED Quads in MuttVars in mutt_config.c
500487 call s:boolQuadGen('Quad', [
501- \ 'mime_fwd', 'pgp_encrypt_self', 'pgp_verify_sig', 'smime_encrypt_self'
502- \ ], 1)
488+ \ 'mime_fwd', 'pgp_encrypt_self', 'pgp_verify_sig', 'smime_encrypt_self'
489+ \ ], 1)
503490
504-" CHECKED 2019-11-02
505-" List of DT_NUMBER or DT_LONG in MuttVars in init.h
491+" CHECKED 2020-06-21
492+" List of DT_NUMBER or DT_LONG in MuttVars in mutt_config.c
506493 syntax keyword muttrcVarNum skipwhite contained
507- \ connect_timeout debug_level history imap_keepalive imap_pipeline_depth
508- \ imap_poll_timeout mail_check mail_check_stats_interval menu_context
509- \ net_inc nm_db_limit nm_open_timeout nm_query_window_current_position
510- \ nm_query_window_duration nntp_context nntp_poll pager_context
511- \ pager_index_lines pgp_timeout pop_checkinterval read_inc reflow_wrap
512- \ save_history score_threshold_delete score_threshold_flag
513- \ score_threshold_read search_context sendmail_wait sidebar_component_depth
514- \ sidebar_width skip_quoted_offset sleep_time smime_timeout
515- \ ssl_min_dh_prime_bits timeout time_inc wrap wrap_headers write_inc
516- \ header_cache_pagesize imap_fetch_chunk_size toggle_quoted_show_levels
517- \ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
494+ \ connect_timeout debug_level header_cache_compress_level history
495+ \ imap_fetch_chunk_size imap_keepalive imap_pipeline_depth imap_poll_timeout mail_check
496+ \ mail_check_stats_interval menu_context net_inc nm_db_limit nm_open_timeout
497+ \ nm_query_window_current_position nm_query_window_duration nntp_context nntp_poll
498+ \ pager_context pager_index_lines pgp_timeout pop_checkinterval read_inc reflow_wrap
499+ \ save_history score_threshold_delete score_threshold_flag score_threshold_read
500+ \ search_context sendmail_wait sidebar_component_depth sidebar_width skip_quoted_offset
501+ \ sleep_time smime_timeout ssl_min_dh_prime_bits timeout time_inc toggle_quoted_show_levels
502+ \ wrap wrap_headers write_inc
503+ \ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
518504 syntax keyword muttrcVarDeprecatedNum contained skipwhite
519- \ wrapmargin
520- \ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
505+ \ header_cache_pagesize wrapmargin
506+ \ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
521507
522-" CHECKED 2019-11-02
523-" List of DT_STRING in MuttVars in init.h
508+" CHECKED 2020-06-21
509+" List of DT_STRING in MuttVars in mutt_config.c
524510 " Special cases first, and all the rest at the end
525511 " Formats themselves must be updated in their respective groups
526512 " See s:escapesConditionals
527-syntax match muttrcVarStr contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
513+syntax match muttrcVarStr contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
528514 syntax keyword muttrcVarStr contained skipwhite alias_format nextgroup=muttrcVarEqualsAliasFmt
529515 syntax keyword muttrcVarStr contained skipwhite attach_format nextgroup=muttrcVarEqualsAttachFmt
530516 syntax keyword muttrcVarStr contained skipwhite compose_format nextgroup=muttrcVarEqualsComposeFmt
531517 syntax keyword muttrcVarStr contained skipwhite folder_format vfolder_format nextgroup=muttrcVarEqualsFolderFmt
532-syntax keyword muttrcVarStr contained skipwhite attribution index_format message_format pager_format nextgroup=muttrcVarEqualsIdxFmt
533-" Deprecated format
534-syntax keyword muttrcVarDeprecatedStr contained skipwhite hdr_format msg_format nextgroup=muttrcVarEqualsIdxFmt
518+syntax keyword muttrcVarStr contained skipwhite attribution forward_format index_format message_format pager_format nextgroup=muttrcVarEqualsIdxFmt
535519 syntax keyword muttrcVarStr contained skipwhite mix_entry_format nextgroup=muttrcVarEqualsMixFmt
536520 syntax keyword muttrcVarStr contained skipwhite
537- \ pgp_clearsign_command pgp_decode_command pgp_decrypt_command
538- \ pgp_encrypt_only_command pgp_encrypt_sign_command pgp_export_command
539- \ pgp_import_command pgp_list_pubring_command pgp_list_secring_command
540- \ pgp_sign_command pgp_verify_command pgp_verify_key_command
541- \ nextgroup=muttrcVarEqualsPGPCmdFmt
521+ \ pgp_clearsign_command pgp_decode_command pgp_decrypt_command
522+ \ pgp_encrypt_only_command pgp_encrypt_sign_command pgp_export_command pgp_getkeys_command
523+ \ pgp_import_command pgp_list_pubring_command pgp_list_secring_command
524+ \ pgp_sign_command pgp_verify_command pgp_verify_key_command
525+ \ nextgroup=muttrcVarEqualsPGPCmdFmt
542526 syntax keyword muttrcVarStr contained skipwhite pgp_entry_format nextgroup=muttrcVarEqualsPGPFmt
543-syntax keyword muttrcVarStr contained skipwhite pgp_getkeys_command nextgroup=muttrcVarEqualsPGPGetKeysFmt
544527 syntax keyword muttrcVarStr contained skipwhite query_format nextgroup=muttrcVarEqualsQueryFmt
545528 syntax keyword muttrcVarStr contained skipwhite
546- \ smime_decrypt_command smime_encrypt_command smime_get_cert_command
547- \ smime_get_cert_email_command smime_get_signer_cert_command
548- \ smime_import_cert_command smime_pk7out_command smime_sign_command
549- \ smime_verify_command smime_verify_opaque_command
550- \ nextgroup=muttrcVarEqualsSmimeFmt
551-syntax keyword muttrcVarStr contained skipwhite ts_icon_format ts_status_format status_format nextgroup=muttrcVarEqualsStatusFmt
552-" Deprecated format
553-syntax keyword muttrcVarDeprecatedStr contained skipwhite xterm_icon xterm_title nextgroup=muttrcVarEqualsStatusFmt
529+ \ smime_decrypt_command smime_encrypt_command smime_get_cert_command
530+ \ smime_get_cert_email_command smime_get_signer_cert_command
531+ \ smime_import_cert_command smime_pk7out_command smime_sign_command
532+ \ smime_verify_command smime_verify_opaque_command
533+ \ nextgroup=muttrcVarEqualsSmimeFmt
534+syntax keyword muttrcVarStr contained skipwhite status_format ts_icon_format ts_status_format nextgroup=muttrcVarEqualsStatusFmt
554535 syntax keyword muttrcVarStr contained skipwhite date_format nextgroup=muttrcVarEqualsStrftimeFmt
555536 syntax keyword muttrcVarStr contained skipwhite group_index_format nextgroup=muttrcVarEqualsGrpIdxFmt
556537 syntax keyword muttrcVarStr contained skipwhite sidebar_format nextgroup=muttrcVarEqualsSdbFmt
557538 syntax keyword muttrcVarStr contained skipwhite
558- \ assumed_charset attach_charset attach_sep attribution_locale charset
559- \ config_charset content_type default_hook dsn_notify dsn_return
560- \ empty_subject escape forward_attribution_intro forward_attribution_trailer
561- \ forward_format hidden_tags hostname
562- \ imap_authenticators imap_delim_chars imap_headers imap_login imap_pass
563- \ imap_user indent_string mailcap_path mark_macro_prefix mh_seq_flagged
564- \ mh_seq_replied mh_seq_unseen newsgroups_charset
565- \ news_server nm_default_uri nm_exclude_tags nm_query_type
566- \ nm_query_window_current_search nm_query_window_timebase nm_record_tags
567- \ nm_unread_tag nntp_authenticators nntp_pass nntp_user pgp_default_key
568- \ pgp_sign_as pipe_sep pop_authenticators pop_host pop_pass pop_user
569- \ postpone_encrypt_as post_indent_string preconnect realname send_charset
570- \ show_multipart_alternative sidebar_delim_chars sidebar_divider_char
571- \ sidebar_indent_string simple_search smime_default_key smime_encrypt_with
572- \ smime_sign_as smime_sign_digest_alg smtp_authenticators smtp_pass smtp_url
573- \ spam_separator ssl_ciphers autocrypt_acct_format
574- \ crypt_protected_headers_subject header_cache_backend nm_flagged_tag
575- \ nm_replied_tag preferred_languages
576- \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
539+ \ abort_key arrow_string assumed_charset attach_charset attach_sep attribution_locale
540+ \ autocrypt_acct_format charset config_charset content_type crypt_protected_headers_subject
541+ \ default_hook dsn_notify dsn_return empty_subject escape forward_attribution_intro
542+ \ forward_attribution_trailer header_cache_backend header_cache_compress_method hidden_tags
543+ \ hostname imap_authenticators imap_delim_chars imap_headers imap_login imap_pass imap_user
544+ \ indent_string mailcap_path mark_macro_prefix mh_seq_flagged mh_seq_replied mh_seq_unseen
545+ \ newsgroups_charset news_server nm_default_url nm_exclude_tags nm_flagged_tag nm_query_type
546+ \ nm_query_window_current_search nm_query_window_timebase nm_record_tags nm_replied_tag
547+ \ nm_unread_tag nntp_authenticators nntp_pass nntp_user pgp_default_key pgp_sign_as pipe_sep
548+ \ pop_authenticators pop_host pop_pass pop_user postpone_encrypt_as post_indent_string
549+ \ preconnect preferred_languages realname send_charset show_multipart_alternative
550+ \ sidebar_delim_chars sidebar_divider_char sidebar_indent_string simple_search
551+ \ smime_default_key smime_encrypt_with smime_sign_as smime_sign_digest_alg
552+ \ smtp_authenticators smtp_pass smtp_url smtp_user spam_separator ssl_ciphers
553+ \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
554+
577555 " Deprecated strings
578-syntax keyword muttrcVarDeprecatedStr contained skipwhite
579- \ forw_format indent_str pgp_self_encrypt_as post_indent_str
580- \ smime_self_encrypt_as
581- \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
556+syntax keyword muttrcVarDeprecatedStr
557+ \ abort_noattach_regexp attach_keyword forw_format hdr_format indent_str msg_format
558+ \ nm_default_uri pgp_self_encrypt_as post_indent_str print_cmd quote_regexp reply_regexp
559+ \ smime_self_encrypt_as xterm_icon xterm_title
582560
583-" CHECKED 2019-11-02
561+" CHECKED 2020-06-21
584562 " List of DT_ADDRESS
585-syntax keyword muttrcVarStr contained skipwhite envelope_from_address from nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
563+syntax keyword muttrcVarStr contained skipwhite envelope_from_address from nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
586564 " List of DT_ENUM
587-syntax keyword muttrcVarStr contained skipwhite mbox_type nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
565+syntax keyword muttrcVarStr contained skipwhite mbox_type nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
588566 " List of DT_MBTABLE
589-syntax keyword muttrcVarStr contained skipwhite crypt_chars flag_chars from_chars status_chars to_chars nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
567+syntax keyword muttrcVarStr contained skipwhite crypt_chars flag_chars from_chars status_chars to_chars nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
590568
591-" CHECKED 2019-11-02
569+" CHECKED 2020-06-21
592570 " List of DT_PATH
593571 syntax keyword muttrcVarStr contained skipwhite
594- \ alias_file attach_save_dir autocrypt_dir certificate_file debug_file
595- \ entropy_file folder header_cache history_file mbox message_cachedir newsrc
596- \ news_cache_dir postponed record signature smime_ca_location
597- \ smime_certificates smime_keys spoolfile ssl_ca_certificates_file
598- \ ssl_client_cert tmpdir trash
599- \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
572+ \ alias_file attach_save_dir autocrypt_dir certificate_file debug_file
573+ \ entropy_file folder header_cache history_file mbox message_cachedir newsrc
574+ \ news_cache_dir postponed record signature smime_ca_location
575+ \ smime_certificates smime_keys spoolfile ssl_ca_certificates_file
576+ \ ssl_client_cert tmpdir trash
577+ \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
600578 " List of DT_COMMAND (excluding pgp_*_command and smime_*_command)
601579 syntax keyword muttrcVarStr contained skipwhite
602- \ display_filter editor inews ispell mixmaster new_mail_command pager
603- \ print_command query_command sendmail shell visual external_search_command
604- \ imap_oauth_refresh_command pop_oauth_refresh_command
605- \ mime_type_query_command smtp_oauth_refresh_command tunnel
606- \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
580+ \ display_filter editor inews ispell mixmaster new_mail_command pager
581+ \ print_command query_command sendmail shell visual external_search_command
582+ \ imap_oauth_refresh_command pop_oauth_refresh_command
583+ \ mime_type_query_command smtp_oauth_refresh_command tunnel
584+ \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
607585
608-" CHECKED 2019-11-02
586+" CHECKED 2020-06-21
609587 " List of DT_REGEX
610588 syntax keyword muttrcVarStr contained skipwhite
611- \ abort_noattach_regex gecos_mask mask pgp_decryption_okay pgp_good_sign
612- \ quote_regex reply_regex smileys
613- \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
614-" List of deprecated DT_STRING|DT_COMMAND
615-syntax keyword muttrcVarDeprecatedStr contained skipwhite print_cmd nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
616-" List of deprecated DT_REGEX
617-syntax keyword muttrcVarDeprecatedStr contained skipwhite abort_noattach_regexp attach_keyword quote_regexp reply_regexp nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
589+ \ abort_noattach_regex gecos_mask mask pgp_decryption_okay pgp_good_sign
590+ \ quote_regex reply_regex smileys
591+ \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
618592 " List of DT_SORT
619593 syntax keyword muttrcVarStr contained skipwhite
620- \ pgp_sort_keys sidebar_sort_method sort sort_alias sort_aux sort_browser
621- \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
622-
623-" CHECKED 2019-11-02
624-" List of commands in Commands in init.h
625-" Remember to remove hooks, they have already been dealt with
626-syntax keyword muttrcCommand skipwhite charset-hook nextgroup=muttrcRXString
627-syntax keyword muttrcCommand skipwhite unhook nextgroup=muttrcHooks
628-syntax keyword muttrcCommand skipwhite spam nextgroup=muttrcSpamPattern
629-syntax keyword muttrcCommand skipwhite nospam nextgroup=muttrcNoSpamPattern
630-syntax keyword muttrcCommand skipwhite bind nextgroup=muttrcBindMenuList,muttrcBindMenuListNL
631-syntax keyword muttrcCommand skipwhite macro nextgroup=muttrcMacroMenuList,muttrcMacroMenuListNL
632-syntax keyword muttrcCommand skipwhite alias nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
633-syntax keyword muttrcCommand skipwhite unalias nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
634-syntax keyword muttrcCommand skipwhite set unset reset toggle nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
635-syntax keyword muttrcCommand skipwhite exec nextgroup=muttrcFunction
636-syntax keyword muttrcCommand skipwhite
637- \ alternative_order attachments auto_view finish hdr_order ifdef ifndef
638- \ ignore lua lua-source mailboxes mailto_allow mime_lookup my_hdr push score
639- \ setenv sidebar_whitelist source subjectrx subscribe-to tag-formats
640- \ tag-transforms unalternative_order unattachments unauto_view uncolor
641- \ unhdr_order unignore unmailboxes unmailto_allow unmime_lookup unmono
642- \ unmy_hdr unscore unsetenv unsidebar_whitelist unsubjectrx unsubscribe-from
643- \ unvirtual-mailboxes virtual-mailboxes named-mailboxes
644- \ echo unbind unmacro
594+ \ pgp_sort_keys sidebar_sort_method sort sort_alias sort_aux sort_browser
595+ \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
645596
646-" CHECKED 2019-11-02
647-" List of functions in functions.h
648-syntax match muttrcFunction contained "\<accept\>"
649-syntax match muttrcFunction contained "\<append\>"
650-syntax match muttrcFunction contained "\<attach-file\>"
651-syntax match muttrcFunction contained "\<attach-key\>"
652-syntax match muttrcFunction contained "\<attach-message\>"
653-syntax match muttrcFunction contained "\<attach-news-message\>"
654-syntax match muttrcFunction contained "\<autocrypt-acct-menu\>"
655-syntax match muttrcFunction contained "\<autocrypt-menu\>"
656-syntax match muttrcFunction contained "\<backspace\>"
657-syntax match muttrcFunction contained "\<backward-char\>"
658-syntax match muttrcFunction contained "\<backward-word\>"
659-syntax match muttrcFunction contained "\<bol\>"
660-syntax match muttrcFunction contained "\<bottom-page\>"
661-syntax match muttrcFunction contained "\<bottom\>"
662-syntax match muttrcFunction contained "\<bounce-message\>"
663-syntax match muttrcFunction contained "\<break-thread\>"
664-syntax match muttrcFunction contained "\<buffy-cycle\>"
665-syntax match muttrcFunction contained "\<buffy-list\>"
666-syntax match muttrcFunction contained "\<capitalize-word\>"
667-syntax match muttrcFunction contained "\<catchup\>"
668-syntax match muttrcFunction contained "\<chain-next\>"
669-syntax match muttrcFunction contained "\<chain-prev\>"
670-syntax match muttrcFunction contained "\<change-dir\>"
671-syntax match muttrcFunction contained "\<change-folder-readonly\>"
672-syntax match muttrcFunction contained "\<change-folder\>"
673-syntax match muttrcFunction contained "\<change-newsgroup-readonly\>"
674-syntax match muttrcFunction contained "\<change-newsgroup\>"
675-syntax match muttrcFunction contained "\<change-vfolder\>"
676-syntax match muttrcFunction contained "\<check-new\>"
677-syntax match muttrcFunction contained "\<check-stats\>"
678-syntax match muttrcFunction contained "\<check-traditional-pgp\>"
679-syntax match muttrcFunction contained "\<clear-flag\>"
680-syntax match muttrcFunction contained "\<collapse-all\>"
681-syntax match muttrcFunction contained "\<collapse-parts\>"
682-syntax match muttrcFunction contained "\<collapse-thread\>"
683-syntax match muttrcFunction contained "\<complete-query\>"
684-syntax match muttrcFunction contained "\<complete\>"
685-syntax match muttrcFunction contained "\<compose-to-sender\>"
686-syntax match muttrcFunction contained "\<copy-file\>"
687-syntax match muttrcFunction contained "\<copy-message\>"
688-syntax match muttrcFunction contained "\<create-account\>"
689-syntax match muttrcFunction contained "\<create-alias\>"
690-syntax match muttrcFunction contained "\<create-mailbox\>"
691-syntax match muttrcFunction contained "\<current-bottom\>"
692-syntax match muttrcFunction contained "\<current-middle\>"
693-syntax match muttrcFunction contained "\<current-top\>"
694-syntax match muttrcFunction contained "\<decode-copy\>"
695-syntax match muttrcFunction contained "\<decode-save\>"
696-syntax match muttrcFunction contained "\<decrypt-copy\>"
697-syntax match muttrcFunction contained "\<decrypt-save\>"
698-syntax match muttrcFunction contained "\<delete-account\>"
699-syntax match muttrcFunction contained "\<delete-char\>"
700-syntax match muttrcFunction contained "\<delete-entry\>"
701-syntax match muttrcFunction contained "\<delete-mailbox\>"
702-syntax match muttrcFunction contained "\<delete-message\>"
703-syntax match muttrcFunction contained "\<delete-pattern\>"
704-syntax match muttrcFunction contained "\<delete-subthread\>"
705-syntax match muttrcFunction contained "\<delete-thread\>"
706-syntax match muttrcFunction contained "\<delete\>"
707-syntax match muttrcFunction contained "\<descend-directory\>"
708-syntax match muttrcFunction contained "\<detach-file\>"
709-syntax match muttrcFunction contained "\<display-address\>"
710-syntax match muttrcFunction contained "\<display-filename\>"
711-syntax match muttrcFunction contained "\<display-message\>"
712-syntax match muttrcFunction contained "\<display-toggle-weed\>"
713-syntax match muttrcFunction contained "\<downcase-word\>"
714-syntax match muttrcFunction contained "\<edit-bcc\>"
715-syntax match muttrcFunction contained "\<edit-cc\>"
716-syntax match muttrcFunction contained "\<edit-description\>"
717-syntax match muttrcFunction contained "\<edit-encoding\>"
718-syntax match muttrcFunction contained "\<edit-fcc\>"
719-syntax match muttrcFunction contained "\<edit-file\>"
720-syntax match muttrcFunction contained "\<edit-followup-to\>"
721-syntax match muttrcFunction contained "\<edit-from\>"
722-syntax match muttrcFunction contained "\<edit-headers\>"
723-syntax match muttrcFunction contained "\<edit-label\>"
724-syntax match muttrcFunction contained "\<edit-language\>"
725-syntax match muttrcFunction contained "\<edit-message\>"
726-syntax match muttrcFunction contained "\<edit-mime\>"
727-syntax match muttrcFunction contained "\<edit-newsgroups\>"
728-syntax match muttrcFunction contained "\<edit-or-view-raw-message\>"
729-syntax match muttrcFunction contained "\<edit-raw-message\>"
730-syntax match muttrcFunction contained "\<edit-reply-to\>"
731-syntax match muttrcFunction contained "\<edit-subject\>"
732-syntax match muttrcFunction contained "\<edit-to\>"
733-syntax match muttrcFunction contained "\<edit-type\>"
734-syntax match muttrcFunction contained "\<edit-x-comment-to\>"
735-syntax match muttrcFunction contained "\<edit\>"
736-syntax match muttrcFunction contained "\<end-cond\>"
737-syntax match muttrcFunction contained "\<enter-command\>"
738-syntax match muttrcFunction contained "\<enter-mask\>"
739-syntax match muttrcFunction contained "\<entire-thread\>"
740-syntax match muttrcFunction contained "\<eol\>"
741-syntax match muttrcFunction contained "\<exit\>"
742-syntax match muttrcFunction contained "\<extract-keys\>"
743-syntax match muttrcFunction contained "\<fetch-mail\>"
744-syntax match muttrcFunction contained "\<filter-entry\>"
745-syntax match muttrcFunction contained "\<first-entry\>"
746-syntax match muttrcFunction contained "\<flag-message\>"
747-syntax match muttrcFunction contained "\<followup-message\>"
748-syntax match muttrcFunction contained "\<forget-passphrase\>"
749-syntax match muttrcFunction contained "\<forward-char\>"
750-syntax match muttrcFunction contained "\<forward-message\>"
751-syntax match muttrcFunction contained "\<forward-to-group\>"
752-syntax match muttrcFunction contained "\<forward-word\>"
753-syntax match muttrcFunction contained "\<get-attachment\>"
754-syntax match muttrcFunction contained "\<get-children\>"
755-syntax match muttrcFunction contained "\<get-message\>"
756-syntax match muttrcFunction contained "\<get-parent\>"
757-syntax match muttrcFunction contained "\<goto-folder\>"
758-syntax match muttrcFunction contained "\<goto-parent\>"
759-syntax match muttrcFunction contained "\<group-alternatives\>"
760-syntax match muttrcFunction contained "\<group-chat-reply\>"
761-syntax match muttrcFunction contained "\<group-multilingual\>"
762-syntax match muttrcFunction contained "\<group-reply\>"
763-syntax match muttrcFunction contained "\<half-down\>"
764-syntax match muttrcFunction contained "\<half-up\>"
765-syntax match muttrcFunction contained "\<help\>"
766-syntax match muttrcFunction contained "\<history-down\>"
767-syntax match muttrcFunction contained "\<history-search\>"
768-syntax match muttrcFunction contained "\<history-up\>"
769-syntax match muttrcFunction contained "\<imap-fetch-mail\>"
770-syntax match muttrcFunction contained "\<imap-logout-all\>"
771-syntax match muttrcFunction contained "\<insert\>"
772-syntax match muttrcFunction contained "\<ispell\>"
773-syntax match muttrcFunction contained "\<jump\>"
774-syntax match muttrcFunction contained "\<kill-eol\>"
775-syntax match muttrcFunction contained "\<kill-eow\>"
776-syntax match muttrcFunction contained "\<kill-line\>"
777-syntax match muttrcFunction contained "\<kill-word\>"
778-syntax match muttrcFunction contained "\<last-entry\>"
779-syntax match muttrcFunction contained "\<limit-current-thread\>"
780-syntax match muttrcFunction contained "\<limit\>"
781-syntax match muttrcFunction contained "\<link-threads\>"
782-syntax match muttrcFunction contained "\<list-reply\>"
783-syntax match muttrcFunction contained "\<mail-key\>"
784-syntax match muttrcFunction contained "\<mailbox-cycle\>"
785-syntax match muttrcFunction contained "\<mailbox-list\>"
786-syntax match muttrcFunction contained "\<mail\>"
787-syntax match muttrcFunction contained "\<mark-as-new\>"
788-syntax match muttrcFunction contained "\<mark-message\>"
789-syntax match muttrcFunction contained "\<middle-page\>"
790-syntax match muttrcFunction contained "\<mix\>"
791-syntax match muttrcFunction contained "\<modify-labels-then-hide\>"
792-syntax match muttrcFunction contained "\<modify-labels\>"
793-syntax match muttrcFunction contained "\<modify-tags-then-hide\>"
794-syntax match muttrcFunction contained "\<modify-tags\>"
795-syntax match muttrcFunction contained "\<move-down\>"
796-syntax match muttrcFunction contained "\<move-up\>"
797-syntax match muttrcFunction contained "\<new-mime\>"
798-syntax match muttrcFunction contained "\<next-entry\>"
799-syntax match muttrcFunction contained "\<next-line\>"
800-syntax match muttrcFunction contained "\<next-new-then-unread\>"
801-syntax match muttrcFunction contained "\<next-new\>"
802-syntax match muttrcFunction contained "\<next-page\>"
803-syntax match muttrcFunction contained "\<next-subthread\>"
804-syntax match muttrcFunction contained "\<next-thread\>"
805-syntax match muttrcFunction contained "\<next-undeleted\>"
806-syntax match muttrcFunction contained "\<next-unread-mailbox\>"
807-syntax match muttrcFunction contained "\<next-unread\>"
808-syntax match muttrcFunction contained "\<noop\>"
809-syntax match muttrcFunction contained "\<parent-message\>"
810-syntax match muttrcFunction contained "\<pgp-menu\>"
811-syntax match muttrcFunction contained "\<pipe-entry\>"
812-syntax match muttrcFunction contained "\<pipe-message\>"
813-syntax match muttrcFunction contained "\<post-message\>"
814-syntax match muttrcFunction contained "\<postpone-message\>"
815-syntax match muttrcFunction contained "\<previous-entry\>"
816-syntax match muttrcFunction contained "\<previous-line\>"
817-syntax match muttrcFunction contained "\<previous-new-then-unread\>"
818-syntax match muttrcFunction contained "\<previous-new\>"
819-syntax match muttrcFunction contained "\<previous-page\>"
820-syntax match muttrcFunction contained "\<previous-subthread\>"
821-syntax match muttrcFunction contained "\<previous-thread\>"
822-syntax match muttrcFunction contained "\<previous-undeleted\>"
823-syntax match muttrcFunction contained "\<previous-unread\>"
824-syntax match muttrcFunction contained "\<print-entry\>"
825-syntax match muttrcFunction contained "\<print-message\>"
826-syntax match muttrcFunction contained "\<purge-message\>"
827-syntax match muttrcFunction contained "\<purge-thread\>"
828-syntax match muttrcFunction contained "\<quasi-delete\>"
829-syntax match muttrcFunction contained "\<query-append\>"
830-syntax match muttrcFunction contained "\<query\>"
831-syntax match muttrcFunction contained "\<quit\>"
832-syntax match muttrcFunction contained "\<quote-char\>"
833-syntax match muttrcFunction contained "\<read-subthread\>"
834-syntax match muttrcFunction contained "\<read-thread\>"
835-syntax match muttrcFunction contained "\<recall-message\>"
836-syntax match muttrcFunction contained "\<reconstruct-thread\>"
837-syntax match muttrcFunction contained "\<redraw-screen\>"
838-syntax match muttrcFunction contained "\<refresh\>"
839-syntax match muttrcFunction contained "\<reload-active\>"
840-syntax match muttrcFunction contained "\<rename-attachment\>"
841-syntax match muttrcFunction contained "\<rename-file\>"
842-syntax match muttrcFunction contained "\<rename-mailbox\>"
843-syntax match muttrcFunction contained "\<reply\>"
844-syntax match muttrcFunction contained "\<resend-message\>"
845-syntax match muttrcFunction contained "\<root-message\>"
846-syntax match muttrcFunction contained "\<save-entry\>"
847-syntax match muttrcFunction contained "\<save-message\>"
848-syntax match muttrcFunction contained "\<search-next\>"
849-syntax match muttrcFunction contained "\<search-opposite\>"
850-syntax match muttrcFunction contained "\<search-reverse\>"
851-syntax match muttrcFunction contained "\<search-toggle\>"
852-syntax match muttrcFunction contained "\<search\>"
853-syntax match muttrcFunction contained "\<select-entry\>"
854-syntax match muttrcFunction contained "\<select-new\>"
855-syntax match muttrcFunction contained "\<send-message\>"
856-syntax match muttrcFunction contained "\<set-flag\>"
857-syntax match muttrcFunction contained "\<shell-escape\>"
858-syntax match muttrcFunction contained "\<show-limit\>"
859-syntax match muttrcFunction contained "\<show-log-messages\>"
860-syntax match muttrcFunction contained "\<show-version\>"
861-syntax match muttrcFunction contained "\<sidebar-next-new\>"
862-syntax match muttrcFunction contained "\<sidebar-next\>"
863-syntax match muttrcFunction contained "\<sidebar-open\>"
864-syntax match muttrcFunction contained "\<sidebar-page-down\>"
865-syntax match muttrcFunction contained "\<sidebar-page-up\>"
866-syntax match muttrcFunction contained "\<sidebar-prev-new\>"
867-syntax match muttrcFunction contained "\<sidebar-prev\>"
868-syntax match muttrcFunction contained "\<sidebar-toggle-virtual\>"
869-syntax match muttrcFunction contained "\<sidebar-toggle-visible\>"
870-syntax match muttrcFunction contained "\<skip-quoted\>"
871-syntax match muttrcFunction contained "\<smime-menu\>"
872-syntax match muttrcFunction contained "\<sort-mailbox\>"
873-syntax match muttrcFunction contained "\<sort-reverse\>"
874-syntax match muttrcFunction contained "\<sort\>"
875-syntax match muttrcFunction contained "\<subscribe-pattern\>"
876-syntax match muttrcFunction contained "\<subscribe\>"
877-syntax match muttrcFunction contained "\<sync-mailbox\>"
878-syntax match muttrcFunction contained "\<tag-entry\>"
879-syntax match muttrcFunction contained "\<tag-message\>"
880-syntax match muttrcFunction contained "\<tag-pattern\>"
881-syntax match muttrcFunction contained "\<tag-prefix-cond\>"
882-syntax match muttrcFunction contained "\<tag-prefix\>"
883-syntax match muttrcFunction contained "\<tag-subthread\>"
884-syntax match muttrcFunction contained "\<tag-thread\>"
885-syntax match muttrcFunction contained "\<toggle-active\>"
886-syntax match muttrcFunction contained "\<toggle-disposition\>"
887-syntax match muttrcFunction contained "\<toggle-mailboxes\>"
888-syntax match muttrcFunction contained "\<toggle-new\>"
889-syntax match muttrcFunction contained "\<toggle-prefer-encrypt\>"
890-syntax match muttrcFunction contained "\<toggle-quoted\>"
891-syntax match muttrcFunction contained "\<toggle-read\>"
892-syntax match muttrcFunction contained "\<toggle-recode\>"
893-syntax match muttrcFunction contained "\<toggle-subscribed\>"
894-syntax match muttrcFunction contained "\<toggle-unlink\>"
895-syntax match muttrcFunction contained "\<toggle-write\>"
896-syntax match muttrcFunction contained "\<top-page\>"
897-syntax match muttrcFunction contained "\<top\>"
898-syntax match muttrcFunction contained "\<transpose-chars\>"
899-syntax match muttrcFunction contained "\<uncatchup\>"
900-syntax match muttrcFunction contained "\<undelete-entry\>"
901-syntax match muttrcFunction contained "\<undelete-message\>"
902-syntax match muttrcFunction contained "\<undelete-pattern\>"
903-syntax match muttrcFunction contained "\<undelete-subthread\>"
904-syntax match muttrcFunction contained "\<undelete-thread\>"
905-syntax match muttrcFunction contained "\<unsubscribe-pattern\>"
906-syntax match muttrcFunction contained "\<unsubscribe\>"
907-syntax match muttrcFunction contained "\<untag-pattern\>"
908-syntax match muttrcFunction contained "\<upcase-word\>"
909-syntax match muttrcFunction contained "\<update-encoding\>"
910-syntax match muttrcFunction contained "\<verify-key\>"
911-syntax match muttrcFunction contained "\<vfolder-from-query-readonly\>"
912-syntax match muttrcFunction contained "\<vfolder-from-query\>"
913-syntax match muttrcFunction contained "\<vfolder-window-backward\>"
914-syntax match muttrcFunction contained "\<vfolder-window-forward\>"
915-syntax match muttrcFunction contained "\<view-attachments\>"
916-syntax match muttrcFunction contained "\<view-attach\>"
917-syntax match muttrcFunction contained "\<view-file\>"
918-syntax match muttrcFunction contained "\<view-mailcap\>"
919-syntax match muttrcFunction contained "\<view-name\>"
920-syntax match muttrcFunction contained "\<view-raw-message\>"
921-syntax match muttrcFunction contained "\<view-text\>"
922-syntax match muttrcFunction contained "\<what-key\>"
923-syntax match muttrcFunction contained "\<write-fcc\>"
597+" CHECKED 2020-06-21
598+" List of commands in Commands in mutt_config.c
599+" Remember to remove hooks, they have already been dealt with
600+syntax keyword muttrcCommand skipwhite alias nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
601+syntax keyword muttrcCommand skipwhite bind nextgroup=muttrcBindMenuList,muttrcBindMenuListNL
602+syntax keyword muttrcCommand skipwhite exec nextgroup=muttrcFunction
603+syntax keyword muttrcCommand skipwhite macro nextgroup=muttrcMacroMenuList,muttrcMacroMenuListNL
604+syntax keyword muttrcCommand skipwhite nospam nextgroup=muttrcNoSpamPattern
605+syntax keyword muttrcCommand skipwhite set unset reset toggle nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
606+syntax keyword muttrcCommand skipwhite spam nextgroup=muttrcSpamPattern
607+syntax keyword muttrcCommand skipwhite unalias nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
608+syntax keyword muttrcCommand skipwhite unhook nextgroup=muttrcHooks
609+syntax keyword muttrcCommand skipwhite
610+ \ alternative_order attachments auto_view finish hdr_order ifdef ifndef
611+ \ ignore lua lua-source mailboxes mailto_allow mime_lookup my_hdr push score
612+ \ setenv sidebar_whitelist source subjectrx subscribe-to tag-formats
613+ \ tag-transforms unalternative_order unattachments unauto_view uncolor
614+ \ unhdr_order unignore unmailboxes unmailto_allow unmime_lookup unmono
615+ \ unmy_hdr unscore unsetenv unsidebar_whitelist unsubjectrx unsubscribe-from
616+ \ unvirtual-mailboxes virtual-mailboxes named-mailboxes
617+ \ echo unbind unmacro
618+
619+function! s:genFunctions(functions)
620+ for f in a:functions
621+ exec 'syntax match muttrcFunction contained "\<' . l:f . '\>"'
622+ endfor
623+endfunction
624+
625+" CHECKED 2020-06-21
626+" List of functions in functions.c
627+" Note: 'noop' is included but is elsewhere in the source
628+call s:genFunctions(['noop',
629+ \ 'accept', 'append', 'attach-file', 'attach-key', 'attach-message', 'attach-news-message',
630+ \ 'autocrypt-acct-menu', 'autocrypt-menu', 'backspace', 'backward-char', 'backward-word',
631+ \ 'bol', 'bottom-page', 'bottom', 'bounce-message', 'break-thread', 'buffy-cycle',
632+ \ 'buffy-list', 'capitalize-word', 'catchup', 'chain-next', 'chain-prev', 'change-dir',
633+ \ 'change-folder-readonly', 'change-folder', 'change-newsgroup-readonly',
634+ \ 'change-newsgroup', 'change-vfolder', 'check-new', 'check-stats',
635+ \ 'check-traditional-pgp', 'clear-flag', 'collapse-all', 'collapse-parts',
636+ \ 'collapse-thread', 'complete-query', 'complete', 'compose-to-sender', 'copy-file',
637+ \ 'copy-message', 'create-account', 'create-alias', 'create-mailbox', 'current-bottom',
638+ \ 'current-middle', 'current-top', 'decode-copy', 'decode-save', 'decrypt-copy',
639+ \ 'decrypt-save', 'delete-account', 'delete-char', 'delete-entry', 'delete-mailbox',
640+ \ 'delete-message', 'delete-pattern', 'delete-subthread', 'delete-thread', 'delete',
641+ \ 'descend-directory', 'detach-file', 'display-address', 'display-filename',
642+ \ 'display-message', 'display-toggle-weed', 'downcase-word', 'edit-bcc', 'edit-cc',
643+ \ 'edit-description', 'edit-encoding', 'edit-fcc', 'edit-file', 'edit-followup-to',
644+ \ 'edit-from', 'edit-headers', 'edit-label', 'edit-language', 'edit-message', 'edit-mime',
645+ \ 'edit-newsgroups', 'edit-or-view-raw-message', 'edit-raw-message', 'edit-reply-to',
646+ \ 'edit-subject', 'edit-to', 'edit-type', 'edit-x-comment-to', 'edit', 'end-cond',
647+ \ 'enter-command', 'enter-mask', 'entire-thread', 'eol', 'exit', 'extract-keys',
648+ \ 'fetch-mail', 'filter-entry', 'first-entry', 'flag-message', 'followup-message',
649+ \ 'forget-passphrase', 'forward-char', 'forward-message', 'forward-to-group',
650+ \ 'forward-word', 'get-attachment', 'get-children', 'get-message', 'get-parent',
651+ \ 'goto-folder', 'goto-parent', 'group-alternatives', 'group-chat-reply',
652+ \ 'group-multilingual', 'group-reply', 'half-down', 'half-up', 'help', 'history-down',
653+ \ 'history-search', 'history-up', 'imap-fetch-mail', 'imap-logout-all', 'insert', 'ispell',
654+ \ 'jump', 'kill-eol', 'kill-eow', 'kill-line', 'kill-word', 'last-entry',
655+ \ 'limit-current-thread', 'limit', 'link-threads', 'list-reply', 'mail-key',
656+ \ 'mailbox-cycle', 'mailbox-list', 'mail', 'mark-as-new', 'mark-message', 'middle-page',
657+ \ 'mix', 'modify-labels-then-hide', 'modify-labels', 'modify-tags-then-hide',
658+ \ 'modify-tags', 'move-down', 'move-up', 'new-mime', 'next-entry', 'next-line',
659+ \ 'next-new-then-unread', 'next-new', 'next-page', 'next-subthread', 'next-thread',
660+ \ 'next-undeleted', 'next-unread-mailbox', 'next-unread', 'parent-message', 'pgp-menu',
661+ \ 'pipe-entry', 'pipe-message', 'post-message', 'postpone-message', 'previous-entry',
662+ \ 'previous-line', 'previous-new-then-unread', 'previous-new', 'previous-page',
663+ \ 'previous-subthread', 'previous-thread', 'previous-undeleted', 'previous-unread',
664+ \ 'print-entry', 'print-message', 'purge-message', 'purge-thread', 'quasi-delete',
665+ \ 'query-append', 'query', 'quit', 'quote-char', 'read-subthread', 'read-thread',
666+ \ 'recall-message', 'reconstruct-thread', 'redraw-screen', 'refresh', 'reload-active',
667+ \ 'rename-attachment', 'rename-file', 'rename-mailbox', 'reply', 'resend-message',
668+ \ 'root-message', 'save-entry', 'save-message', 'search-next', 'search-opposite',
669+ \ 'search-reverse', 'search-toggle', 'search', 'select-entry', 'select-new',
670+ \ 'send-message', 'set-flag', 'shell-escape', 'show-limit', 'show-log-messages',
671+ \ 'show-version', 'sidebar-next-new', 'sidebar-first', 'sidebar-last', 'sidebar-next',
672+ \ 'sidebar-open', 'sidebar-page-down', 'sidebar-page-up', 'sidebar-prev-new',
673+ \ 'sidebar-prev', 'sidebar-toggle-virtual', 'sidebar-toggle-visible', 'skip-quoted',
674+ \ 'smime-menu', 'sort-mailbox', 'sort-reverse', 'sort', 'subscribe-pattern',
675+ \ 'sync-mailbox', 'tag-entry', 'tag-message', 'tag-pattern', 'tag-prefix-cond',
676+ \ 'tag-prefix', 'tag-subthread', 'tag-thread', 'toggle-active', 'toggle-disposition',
677+ \ 'toggle-mailboxes', 'toggle-new', 'toggle-prefer-encrypt', 'toggle-quoted',
678+ \ 'toggle-read', 'toggle-recode', 'toggle-subscribed', 'toggle-unlink', 'toggle-write',
679+ \ 'top-page', 'top', 'transpose-chars', 'uncatchup', 'undelete-entry', 'undelete-message',
680+ \ 'undelete-pattern', 'undelete-subthread', 'undelete-thread', 'unsubscribe-pattern',
681+ \ 'untag-pattern', 'upcase-word', 'update-encoding', 'verify-key',
682+ \ 'vfolder-from-query-readonly', 'vfolder-from-query', 'vfolder-window-backward',
683+ \ 'vfolder-window-forward', 'view-attachments', 'view-attach', 'view-file', 'view-mailcap',
684+ \ 'view-name', 'view-raw-message', 'view-text', 'what-key', 'write-fcc'
685+ \ ])
924686
925687 " Define the default highlighting.
926688 " Only when an item doesn't have highlighting yet
927689
928-highlight def link muttrcComment Comment
929-highlight def link muttrcEscape SpecialChar
930-highlight def link muttrcRXChars SpecialChar
931-highlight def link muttrcString String
932-highlight def link muttrcRXString String
933-highlight def link muttrcRXString2 String
934-highlight def link muttrcSpecial Special
935-highlight def link muttrcHooks Type
936-highlight def link muttrcGroupFlag Type
937-highlight def link muttrcGroupDef Macro
938-highlight def link muttrcAddrDef muttrcGroupFlag
939-highlight def link muttrcRXDef muttrcGroupFlag
940-highlight def link muttrcRXPat String
941-highlight def link muttrcAliasGroupName Macro
942-highlight def link muttrcAliasKey Identifier
943-highlight def link muttrcUnAliasKey Identifier
944-highlight def link muttrcAliasEncEmail Identifier
945-highlight def link muttrcAliasParens Type
946-highlight def link muttrcSetNumAssignment Number
947690 highlight def link muttrcSetBoolAssignment Boolean
948691 highlight def link muttrcSetQuadAssignment Boolean
949-highlight def link muttrcSetStrAssignment String
950-highlight def link muttrcEmail Special
951-highlight def link muttrcVariableInner Special
952-highlight def link muttrcEscapedVariable String
953-highlight def link muttrcHeader Type
954-highlight def link muttrcKeySpecial SpecialChar
955-highlight def link muttrcKey Type
956-highlight def link muttrcKeyName SpecialChar
957-highlight def link muttrcVarBool Identifier
958-highlight def link muttrcVarQuad Identifier
959-highlight def link muttrcVarNum Identifier
960-highlight def link muttrcVarStr Identifier
961-highlight def link muttrcMenu Identifier
962-highlight def link muttrcCommand Keyword
963-highlight def link muttrcMacroDescr String
964-highlight def link muttrcAction Macro
692+
693+highlight def link muttrcComment Comment
694+
695+highlight def link muttrcAlternatesLine Error
965696 highlight def link muttrcBadAction Error
966697 highlight def link muttrcBindFunction Error
967698 highlight def link muttrcBindMenuList Error
968-highlight def link muttrcFunction Macro
969-highlight def link muttrcGroupKeyword muttrcCommand
699+highlight def link muttrcColorBG Error
700+highlight def link muttrcColorBGH Error
701+highlight def link muttrcColorBGI Error
702+highlight def link muttrcColorContext Error
703+highlight def link muttrcColorFG Error
704+highlight def link muttrcColorFGH Error
705+highlight def link muttrcColorFGI Error
706+highlight def link muttrcColorLine Error
707+highlight def link muttrcFormatErrors Error
970708 highlight def link muttrcGroupLine Error
971-highlight def link muttrcSubscribeKeyword muttrcCommand
972-highlight def link muttrcSubscribeLine Error
973-highlight def link muttrcListsKeyword muttrcCommand
974709 highlight def link muttrcListsLine Error
975-highlight def link muttrcAlternateKeyword muttrcCommand
976-highlight def link muttrcAlternatesLine Error
977-highlight def link muttrcAttachmentsLine muttrcCommand
978-highlight def link muttrcAttachmentsFlag Type
979-highlight def link muttrcAttachmentsMimeType String
980-highlight def link muttrcColorLine Error
981-highlight def link muttrcColorContext Error
982-highlight def link muttrcColorContextI Identifier
983-highlight def link muttrcColorContextH Identifier
984-highlight def link muttrcColorKeyword muttrcCommand
985-highlight def link muttrcColorField Identifier
710+highlight def link muttrcPattern Error
711+highlight def link muttrcSubscribeLine Error
712+highlight def link muttrcUnColorLine Error
713+highlight def link muttrcVarDeprecatedBool Error
714+highlight def link muttrcVarDeprecatedQuad Error
715+highlight def link muttrcVarDeprecatedStr Error
716+
717+highlight def link muttrcAliasEncEmail Identifier
718+highlight def link muttrcAliasKey Identifier
986719 highlight def link muttrcColorCompose Identifier
987720 highlight def link muttrcColorComposeField Identifier
988-highlight def link muttrcColor Type
989-highlight def link muttrcColorFG Error
990-highlight def link muttrcColorFGI Error
991-highlight def link muttrcColorFGH Error
992-highlight def link muttrcColorBG Error
993-highlight def link muttrcColorBGI Error
994-highlight def link muttrcColorBGH Error
995-highlight def link muttrcMonoAttrib muttrcColor
996-highlight def link muttrcMono muttrcCommand
721+highlight def link muttrcColorContextH Identifier
722+highlight def link muttrcColorContextI Identifier
723+highlight def link muttrcColorField Identifier
724+highlight def link muttrcMenu Identifier
997725 highlight def link muttrcSimplePat Identifier
726+highlight def link muttrcUnAliasKey Identifier
727+highlight def link muttrcUnColorIndex Identifier
728+highlight def link muttrcVarBool Identifier
729+highlight def link muttrcVarNum Identifier
730+highlight def link muttrcVarQuad Identifier
731+highlight def link muttrcVarStr Identifier
732+
733+highlight def link muttrcCommand Keyword
734+
735+highlight def link muttrcAction Macro
736+highlight def link muttrcAliasGroupName Macro
737+highlight def link muttrcFunction Macro
738+highlight def link muttrcGroupDef Macro
998739 highlight def link muttrcSimplePatString Macro
999-highlight def link muttrcSimplePatMetas Special
1000-highlight def link muttrcPattern Error
1001-highlight def link muttrcUnColorLine Error
1002-highlight def link muttrcUnColorKeyword muttrcCommand
1003-highlight def link muttrcUnColorIndex Identifier
1004-highlight def link muttrcShellString muttrcEscape
740+
741+highlight def link muttrcMonoAttrib muttrcColor
742+
743+highlight def link muttrcAlternateKeyword muttrcCommand
744+highlight def link muttrcAttachmentsLine muttrcCommand
745+highlight def link muttrcColorKeyword muttrcCommand
746+highlight def link muttrcGroupKeyword muttrcCommand
747+highlight def link muttrcListsKeyword muttrcCommand
748+highlight def link muttrcMono muttrcCommand
749+highlight def link muttrcPatHooks muttrcCommand
1005750 highlight def link muttrcRXHooks muttrcCommand
1006-highlight def link muttrcRXHookNot Type
1007-highlight def link muttrcPatHooks muttrcCommand
1008-highlight def link muttrcPatHookNot Type
1009-highlight def link muttrcFormatConditionals2 Type
1010-highlight def link muttrcIndexFormatStr muttrcString
1011-highlight def link muttrcIndexFormatEscapes muttrcEscape
1012-highlight def link muttrcIndexFormatConditionals muttrcFormatConditionals2
1013-highlight def link muttrcAliasFormatStr muttrcString
751+highlight def link muttrcSubscribeKeyword muttrcCommand
752+highlight def link muttrcUnColorKeyword muttrcCommand
753+
1014754 highlight def link muttrcAliasFormatEscapes muttrcEscape
1015-highlight def link muttrcAttachFormatStr muttrcString
1016755 highlight def link muttrcAttachFormatEscapes muttrcEscape
1017-highlight def link muttrcAttachFormatConditionals muttrcFormatConditionals2
1018-highlight def link muttrcComposeFormatStr muttrcString
1019756 highlight def link muttrcComposeFormatEscapes muttrcEscape
1020-highlight def link muttrcFolderFormatStr muttrcString
1021757 highlight def link muttrcFolderFormatEscapes muttrcEscape
1022-highlight def link muttrcFolderFormatConditionals muttrcFormatConditionals2
1023-highlight def link muttrcMixFormatStr muttrcString
758+highlight def link muttrcGroupIndexFormatEscapes muttrcEscape
759+highlight def link muttrcIndexFormatEscapes muttrcEscape
1024760 highlight def link muttrcMixFormatEscapes muttrcEscape
1025-highlight def link muttrcMixFormatConditionals muttrcFormatConditionals2
1026-highlight def link muttrcPGPFormatStr muttrcString
1027-highlight def link muttrcPGPFormatEscapes muttrcEscape
1028-highlight def link muttrcPGPFormatConditionals muttrcFormatConditionals2
1029-highlight def link muttrcPGPCmdFormatStr muttrcString
1030761 highlight def link muttrcPGPCmdFormatEscapes muttrcEscape
1031-highlight def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
1032-highlight def link muttrcStatusFormatStr muttrcString
762+highlight def link muttrcPGPFormatEscapes muttrcEscape
763+highlight def link muttrcPGPTimeEscapes muttrcEscape
764+highlight def link muttrcQueryFormatEscapes muttrcEscape
765+highlight def link muttrcShellString muttrcEscape
766+highlight def link muttrcSidebarFormatEscapes muttrcEscape
767+highlight def link muttrcSmimeFormatEscapes muttrcEscape
1033768 highlight def link muttrcStatusFormatEscapes muttrcEscape
769+highlight def link muttrcTimeEscapes muttrcEscape
770+
771+highlight def link muttrcAliasFormatConditionals muttrcFormatConditionals2
772+highlight def link muttrcAttachFormatConditionals muttrcFormatConditionals2
773+highlight def link muttrcComposeFormatConditionals muttrcFormatConditionals2
774+highlight def link muttrcFolderFormatConditionals muttrcFormatConditionals2
775+highlight def link muttrcIndexFormatConditionals muttrcFormatConditionals2
776+highlight def link muttrcMixFormatConditionals muttrcFormatConditionals2
777+highlight def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
778+highlight def link muttrcPGPFormatConditionals muttrcFormatConditionals2
779+highlight def link muttrcSmimeFormatConditionals muttrcFormatConditionals2
1034780 highlight def link muttrcStatusFormatConditionals muttrcFormatConditionals2
1035-highlight def link muttrcPGPGetKeysFormatStr muttrcString
1036-highlight def link muttrcPGPGetKeysFormatEscapes muttrcEscape
781+
782+highlight def link muttrcAddrDef muttrcGroupFlag
783+highlight def link muttrcRXDef muttrcGroupFlag
784+
785+highlight def link muttrcAliasFormatStr muttrcString
786+highlight def link muttrcAttachFormatStr muttrcString
787+highlight def link muttrcComposeFormatStr muttrcString
788+highlight def link muttrcFolderFormatStr muttrcString
789+highlight def link muttrcGroupIndexFormatStr muttrcString
790+highlight def link muttrcIndexFormatStr muttrcString
791+highlight def link muttrcMixFormatStr muttrcString
792+highlight def link muttrcPGPCmdFormatStr muttrcString
793+highlight def link muttrcPGPFormatStr muttrcString
794+highlight def link muttrcQueryFormatStr muttrcString
795+highlight def link muttrcSidebarFormatStr muttrcString
1037796 highlight def link muttrcSmimeFormatStr muttrcString
1038-highlight def link muttrcSmimeFormatEscapes muttrcEscape
1039-highlight def link muttrcSmimeFormatConditionals muttrcFormatConditionals2
1040-highlight def link muttrcTimeEscapes muttrcEscape
1041-highlight def link muttrcPGPTimeEscapes muttrcEscape
1042-highlight def link muttrcStrftimeEscapes Type
797+highlight def link muttrcStatusFormatStr muttrcString
1043798 highlight def link muttrcStrftimeFormatStr muttrcString
1044-highlight def link muttrcFormatErrors Error
1045799
800+highlight def link muttrcSetNumAssignment Number
801+
802+highlight def link muttrcEmail Special
803+highlight def link muttrcSimplePatMetas Special
804+highlight def link muttrcSpecial Special
805+highlight def link muttrcVariableInner Special
806+
807+highlight def link muttrcAliasEncEmailNL SpecialChar
808+highlight def link muttrcAliasENNL SpecialChar
809+highlight def link muttrcAliasGroupDefNL SpecialChar
810+highlight def link muttrcAliasNameNL SpecialChar
811+highlight def link muttrcAliasNL SpecialChar
1046812 highlight def link muttrcBindFunctionNL SpecialChar
1047813 highlight def link muttrcBindKeyNL SpecialChar
1048814 highlight def link muttrcBindMenuListNL SpecialChar
1049-highlight def link muttrcMacroDescrNL SpecialChar
1050-highlight def link muttrcMacroBodyNL SpecialChar
1051-highlight def link muttrcMacroKeyNL SpecialChar
1052-highlight def link muttrcMacroMenuListNL SpecialChar
815+highlight def link muttrcColorBGNL SpecialChar
816+highlight def link muttrcColorFGNL SpecialChar
1053817 highlight def link muttrcColorMatchCountNL SpecialChar
1054818 highlight def link muttrcColorNL SpecialChar
1055819 highlight def link muttrcColorRXNL SpecialChar
1056-highlight def link muttrcColorBGNL SpecialChar
1057-highlight def link muttrcColorFGNL SpecialChar
1058-highlight def link muttrcAliasNameNL SpecialChar
1059-highlight def link muttrcAliasENNL SpecialChar
1060-highlight def link muttrcAliasNL SpecialChar
820+highlight def link muttrcEscape SpecialChar
821+highlight def link muttrcKeyName SpecialChar
822+highlight def link muttrcKeySpecial SpecialChar
823+highlight def link muttrcMacroBodyNL SpecialChar
824+highlight def link muttrcMacroDescrNL SpecialChar
825+highlight def link muttrcMacroKeyNL SpecialChar
826+highlight def link muttrcMacroMenuListNL SpecialChar
827+highlight def link muttrcPatternNL SpecialChar
828+highlight def link muttrcRXChars SpecialChar
829+highlight def link muttrcStringNL SpecialChar
1061830 highlight def link muttrcUnAliasNL SpecialChar
1062-highlight def link muttrcAliasGroupDefNL SpecialChar
1063-highlight def link muttrcAliasEncEmailNL SpecialChar
1064-highlight def link muttrcPatternNL SpecialChar
1065-highlight def link muttrcUnColorPatNL SpecialChar
1066831 highlight def link muttrcUnColorAPNL SpecialChar
1067832 highlight def link muttrcUnColorIndexNL SpecialChar
1068-highlight def link muttrcStringNL SpecialChar
833+highlight def link muttrcUnColorPatNL SpecialChar
1069834
1070-highlight def link muttrcVarDeprecatedBool Error
1071-highlight def link muttrcVarDeprecatedQuad Error
1072-highlight def link muttrcVarDeprecatedStr Error
835+highlight def link muttrcAttachmentsMimeType String
836+highlight def link muttrcEscapedVariable String
837+highlight def link muttrcMacroDescr String
838+highlight def link muttrcRXPat String
839+highlight def link muttrcRXString String
840+highlight def link muttrcRXString2 String
841+highlight def link muttrcSetStrAssignment String
842+highlight def link muttrcString String
843+
844+highlight def link muttrcAliasParens Type
845+highlight def link muttrcAttachmentsFlag Type
846+highlight def link muttrcColor Type
847+highlight def link muttrcFormatConditionals2 Type
848+highlight def link muttrcGroupFlag Type
849+highlight def link muttrcHeader Type
850+highlight def link muttrcHooks Type
851+highlight def link muttrcKey Type
852+highlight def link muttrcPatHookNot Type
853+highlight def link muttrcRXHookNot Type
854+highlight def link muttrcStrftimeEscapes Type
1073855
1074856 let b:current_syntax = "neomuttrc"
1075857
旧リポジトリブラウザで表示