diff options
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/change.txt | 12 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 7 | ||||
-rw-r--r-- | runtime/doc/intro.txt | 8 | ||||
-rw-r--r-- | runtime/doc/options.txt | 5 | ||||
-rw-r--r-- | runtime/doc/quickfix.txt | 25 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 40 | ||||
-rw-r--r-- | runtime/filetype.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/dnsmasq.vim | 109 | ||||
-rw-r--r-- | runtime/syntax/dot.vim | 8 | ||||
-rw-r--r-- | runtime/syntax/gnash.vim | 21 | ||||
-rw-r--r-- | runtime/syntax/ocaml.vim | 38 | ||||
-rw-r--r-- | runtime/syntax/pfmain.vim | 536 |
12 files changed, 718 insertions, 95 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 1c8c0eb0d..33599380d 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.3. Last change: 2011 May 10 +*change.txt* For Vim version 7.3. Last change: 2011 May 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -522,11 +522,11 @@ comment (starting with '"') after the ":!" command. ={motion} Filter {motion} lines through the external program given with the 'equalprg' option. When the 'equalprg' option is empty (this is the default), use the - internal formatting function |C-indenting|. But when - 'indentexpr' is not empty, it will be used instead - |indent-expression|. When Vim was compiled without - internal formatting then the "indent" program is used - as a last resort. + internal formatting function |C-indenting| and + |'lisp'|. But when 'indentexpr' is not empty, it will + be used instead |indent-expression|. When Vim was + compiled without internal formatting then the "indent" + program is used as a last resort. *==* == Filter [count] lines like with ={motion}. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 295fe4a3c..50da2de66 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2011 May 10 +*eval.txt* For Vim version 7.3. Last change: 2011 May 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4076,6 +4076,7 @@ match({expr}, {pat}[, {start}[, {count}]]) *match()* {pat} matches. A match at the first character or |List| item returns zero. If there is no match -1 is returned. + For getting submatches see |matchlist()|. Example: > :echo match("testing", "ing") " results in 4 :echo match([1, 'x'], '\a') " results in 1 @@ -5581,6 +5582,10 @@ substitute({expr}, {pat}, {sub}, {flags}) *substitute()* < This removes the last component of the 'path' option. > :echo substitute("testing", ".*", "\\U\\0", "") < results in "TESTING". + The {sub} argument can start with \=, just like with + |:substitute|. Example: > + :echo substitute(s, '%\(\x\x\)', + \ '\=nr2char("0x" . submatch(1))', 'g') synID({lnum}, {col}, {trans}) *synID()* The result is a Number, which is the syntax ID at the position diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 33eab763d..6682ba6aa 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.3. Last change: 2010 Dec 08 +*intro.txt* For Vim version 7.3. Last change: 2011 May 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -135,8 +135,10 @@ http://www.vim.org/maillist.php Bug reports: *bugs* *bug-reports* *bugreport.vim* -Send bug reports to: Vim bugs <bugs@vim.org> -This is not a maillist but the message is redirected to the Vim maintainer. +Send bug reports to: Vim Developers <vim_dev@vim.org> +This is a maillist, many people will see the message. If you don't want that, +e.g. because it is a security issue, send it to <bugs@vim.org>, this only goes +to the Vim maintainer (that's Bram). Please be brief; all the time that is spent on answering mail is subtracted from the time that is spent on improving Vim! Always give a reproducible example and try to find out which settings or other things influence the diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6ba21febe..a5f614800 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2011 Apr 29 +*options.txt* For Vim version 7.3. Last change: 2011 May 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4104,7 +4104,8 @@ A jump table for the options with a short description can be found at |Q_op|. It is used when a new line is created, for the |=| operator and in Insert mode as specified with the 'indentkeys' option. When this option is not empty, it overrules the 'cindent' and - 'smartindent' indenting. + 'smartindent' indenting. When 'lisp' is set, this option is + overridden by the Lisp indentation algorithm. When 'paste' is set this option is not used for indenting. The expression is evaluated with |v:lnum| set to the line number for which the indent is to be computed. The cursor is also in this line diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 1d05882bd..22562d70b 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.3. Last change: 2011 Feb 01 +*quickfix.txt* For Vim version 7.3. Last change: 2011 May 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -215,28 +215,29 @@ command with 'l'. *:cex* *:cexpr* *E777* :cex[pr][!] {expr} Create a quickfix list using the result of {expr} and - jump to the first error. If {expr} is a String, then - each new-line terminated line in the String is - processed using 'errorformat' and the result is added - to the quickfix list. If {expr} is a List, then each - String item in the list is processed and added to the - quickfix list. Non String items in the List are - ignored. See |:cc| - for [!]. + jump to the first error. + If {expr} is a String, then each new-line terminated + line in the String is processed using the global value + of 'errorformat' and the result is added to the + quickfix list. + If {expr} is a List, then each String item in the list + is processed and added to the quickfix list. Non + String items in the List are ignored. + See |:cc| for [!]. Examples: > :cexpr system('grep -n xyz *') :cexpr getline(1, '$') < *:lex* *:lexpr* -:lex[pr][!] {expr} Same as ":cexpr", except the location list for the +:lex[pr][!] {expr} Same as |:cexpr|, except the location list for the current window is used instead of the quickfix list. *:cgete* *:cgetexpr* :cgete[xpr] {expr} Create a quickfix list using the result of {expr}. - Just like ":cexpr", but don't jump to the first error. + Just like |:cexpr|, but don't jump to the first error. *:lgete* *:lgetexpr* -:lgete[xpr] {expr} Same as ":cgetexpr", except the location list for the +:lgete[xpr] {expr} Same as |:cgetexpr|, except the location list for the current window is used instead of the quickfix list. *:cad* *:caddexpr* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index b96f25533..38df7605e 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2011 May 10 +*todo.txt* For Vim version 7.3. Last change: 2011 May 19 VIM REFERENCE MANUAL by Bram Moolenaar @@ -32,6 +32,9 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. Go through more coverity reports. +Hong Xu: I think src/Make_ro.mak should also be removed. +Two patches 2011 May 15 + Crash in autocomplete, valgrind log. (Greg Weber, 2011 Apr 22) Ex command ":s/ \?/ /g" splits multi-byte characters into bytes. (Dominique @@ -50,6 +53,10 @@ Karkat, 2011 Jan 16) Patch to add 'cscoperelative'. (Raghavendra Prabhu, 2011 Apr 18) +9 "} else" causes following lines to be indented too much. (Rouben + Rostamian, 2008 Aug 30) +Patch by Lech Lorens, 2011 May 16, with more tests. + New syntax file for dnsmasq. (Thilo Six, 2011 Apr 18) Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) @@ -71,6 +78,8 @@ Lepa, 2011 Jan 18) Patch to support ":!start /b cmd". (Xaizek, 2010 Dec 22) +Patch for syntax "extend" not working correctly. (Ben Schmidt, 2011 May 15) + Patch to build with GTK on Mac. (Ben Schmidt, 2011 Jan 18) Use another name instead of FEAT_GUI_ELSEWHERE. @@ -87,6 +96,8 @@ Patch for Python 3 support. (lilydjwg, 2011 Feb 24) Patch to make putting from clipboard linewise when the text ends in a newline. (Sung Pae) Do we want this? +Patch to add third dict argument to sort(). (ZyX, 2011 May 15) + Building the MingW version without clipboard but with multi-byte doesn't work. (Bill Lam, 2010 Sep 18) @@ -132,6 +143,10 @@ problems, even though double quotes are used. (Manuel Stol, 2011 Mar 9) Patch to change the meaning of \n in substitute(). (motoya kurotsu, 2011 Mar 8) +Gui menu edit/paste in block mode insert only inserts in one line (Bjorn +Winckler, 2011 May 11) +Use function to set paste option and restore it, use CTRL-R+ to paste. + Help file foldexpr (ZyX) Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2, @@ -163,6 +178,7 @@ Patch by Christian Brabandt, 2011 May 6. CursorHold repeats typed key when it's the start of a mapping. (Will Gray, 2011 Mar 23) +Christian Brabandt: problem is that OP_PENDING isn't set. Windows keys not set properly on Windows 7? (cncyber, 2010 Aug 26) @@ -323,9 +339,6 @@ mkdir(). When 'paste' is changed with 'pastetoggle', the ruler doesn't reflect this right away. (Samuel Ferencik, 2010 Dec 7) -Windows installer: licence text should not use indent, causes bad word wrap. -(Benjamin Fritz, 2010 Aug 16) - Mac with X11: clipboard doesn't work properly. (Raf, 2010 Aug 16) Using CompilerSet doesn't record where an option was set from. E.g., in the @@ -368,11 +381,6 @@ Can 'undolevels' be a buffer-local option? Helps for making big changes in one file only, set 'ul' to -1 only for that buffer. Patch by Christian Brabandt, 2010 Dec 17. Needs test. -Dos uninstal may delete vim.bat from the wrong directory (e.g., when someone -makes his own wrapper). Add a magic string with the version number to the -.bat file and check for it in the uninstaller. E.g. - # uninstall key: vim7.3* - Problem with cursor in the wrong column. (SungHyun Nam, 2010 Mar 11) Additional info by Dominique Pelle. (also on 2010 Apr 10) @@ -992,6 +1000,9 @@ Jun 3) However, for backwards compatibility escaping might be necessary. Check if the user put quotes around the expanded item? +A throw in a function causes missing an endif below the call. (Spiros +Bousbouras, 2011 May 16) + Error E324 can be given when a cron script has wiped out our temp directory. Give a clear error message about this (and tell them not to wipe out /tmp). @@ -1011,10 +1022,19 @@ go to Insert mode and add a few lines. Then backspacing every other time moves the cursor instead of deleting. (Chris Kaiser, 2007 Sep 25) Patch to use Modern UI 2.0 for the Nsis installer. (Guopeng Wen, 2010 Jul 30) +Latest version: 2011 May 18 8 Windows install with NSIS: make it possible to do a silent install, see http://nsis.sourceforge.net/Docs/Chapter4.html#4.12 Version from Guopeng Wen that does this (2010 Dec 27) +Windows installer: licence text should not use indent, causes bad word wrap. +(Benjamin Fritz, 2010 Aug 16) + +Dos uninstal may delete vim.bat from the wrong directory (e.g., when someone +makes his own wrapper). Add a magic string with the version number to the +.bat file and check for it in the uninstaller. E.g. + # uninstall key: vim7.3* + Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov, 2007 Feb 8) @@ -3801,8 +3821,6 @@ Insert mode: 'cindent', 'smartindent': -9 "} else" causes following lines to be indented too much. (Rouben - Rostamian, 2008 Aug 30) 9 Wrapping a variable initialization should have extra indent: char * veryLongName = "very long string" diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 28507b3f1..701d3688a 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2011 Apr 28 +" Last Change: 2011 May 19 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -556,7 +556,7 @@ au BufNewFile,BufRead */etc/apt/sources.list.d/*.list setf debsources au BufNewFile,BufRead denyhosts.conf setf denyhosts " dnsmasq(8) configuration files -au BufNewFile,BufRead dnsmasq.conf setf dnsmasq +au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq " ROCKLinux package description au BufNewFile,BufRead *.desc setf desc diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim index e6976201f..80248201f 100644 --- a/runtime/syntax/dnsmasq.vim +++ b/runtime/syntax/dnsmasq.vim @@ -1,13 +1,20 @@ " Vim syntax file " Language: dnsmasq(8) configuration file " Maintainer: Thilo Six <T.Six@gmx.de> -" Last Change: 2011 Apr 28 +" Last Change: 17 May 2011 " Credits: This file is a mix of cfg.vim, wget.vim and xf86conf.vim, credits go to: " Igor N. Prischepoff " Doug Kearns " David Ne\v{c}as " -" Options: let dnsmasq_backrgound_light = 1 +" Options: You might want to add this to your vimrc: +" +" if &background == "dark" +" " dnsmasq.vim +" let dnsmasq_backrgound_light = 0 +" else +" let dnsmasq_backrgound_light = 1 +" endif " " For version 5.x: Clear all syntax items @@ -18,6 +25,7 @@ elseif exists ("b:current_syntax") finish endif + if !exists("b:dnsmasq_backrgound_light") if exists("dnsmasq_backrgound_light") let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light @@ -30,75 +38,136 @@ endif " case on syn case match -"Parameters -syn match DnsmasqParams "^.\{-}="me=e-1 contains=DnsmasqComment -"... and their values (don't want to highlight '=' sign) syn match DnsmasqValues "=.*"hs=s+1 contains=DnsmasqComment,DnsmasqSpecial +syn match DnsmasqSpecial display '=\|@\|,\|!\|:' nextgroup=DnsmasqValues +syn match DnsmasqSpecial "#" -"...because we do it here. -syn match DnsmasqEq display '=\|@\|/\|,' nextgroup=DnsmasqValues +syn match DnsmasqIPv4 "\(\d\{1,3}\.\)\{3}\d\{1,3}" nextgroup=DnsmasqSubnet2,DnsmasqRange +syn match DnsmasqSubnet "\<255.\(\d\{1,3}\.\)\{2}\d\{1,3}" +syn match DnsmasqSubnet2 contained "\/\(\d\{1,2}\)\>" +syn match DnsmasqRange contained "-" +syn match DnsmasqMac "\<\(\x\x\?:\)\{5}\x\x\?" -syn match DnsmasqSpecial "#" +syn match DnsmasqTime "\<\(\d\{1,3}\)[hm]\>" " String -syn match DnsmasqString "\".*\"" -syn match DnsmasqString "'.*'" +syn match DnsmasqString "\".*\"" +syn match DnsmasqString "'.*'" " Comments -syn match DnsmasqComment "^#.*$" contains=DnsmasqTodo -syn match DnsmasqComment "[ \t]#.*$" contains=DnsmasqTodo +syn match DnsmasqComment "^#.*$" contains=DnsmasqTodo +syn match DnsmasqComment "\s#.*$" contains=DnsmasqTodo syn keyword DnsmasqTodo FIXME TODO XXX NOT contained +syn match DnsmasqKeywordSpecial "\<set\>:"me=e-1 +syn match DnsmasqKeywordSpecial "\<tag\>:"me=e-1 +syn match DnsmasqKeywordSpecial ",\<static\>"hs=s+1 contains=DnsmasqSpecial +syn match DnsmasqKeywordSpecial ",\<infinite\>"hs=s+1 contains=DnsmasqSpecial +syn match DnsmasqKeywordSpecial "\<encap\>:"me=e-1 +syn match DnsmasqKeywordSpecial "\<net\>:"me=e-1 +syn match DnsmasqKeywordSpecial "\<vendor\>:"me=e-1 +syn match DnsmasqKeywordSpecial "\<option\>:"me=e-1 +syn match DnsmasqKeywordSpecial ",\<ignore\>"hs=s+1 contains=DnsmasqSpecial +syn match DnsmasqKeywordSpecial "\<id\>:"me=e-1 + syn match DnsmasqKeyword "^\s*add-mac\>" +syn match DnsmasqKeyword "^\s*addn-hosts\>" +syn match DnsmasqKeyword "^\s*address\>" +syn match DnsmasqKeyword "^\s*alias\>" syn match DnsmasqKeyword "^\s*all-servers\>" syn match DnsmasqKeyword "^\s*bind-interfaces\>" +syn match DnsmasqKeyword "^\s*bogus-nxdomain\>" syn match DnsmasqKeyword "^\s*bogus-priv\>" +syn match DnsmasqKeyword "^\s*cache-size\>" syn match DnsmasqKeyword "^\s*clear-on-reload\>" +syn match DnsmasqKeyword "^\s*cname\>" +syn match DnsmasqKeyword "^\s*conf-dir\>" +syn match DnsmasqKeyword "^\s*conf-file\>" syn match DnsmasqKeyword "^\s*dhcp-authoritative\>" +syn match DnsmasqKeyword "^\s*dhcp-boot\>" syn match DnsmasqKeyword "^\s*dhcp-fqdn\>" +syn match DnsmasqKeyword "^\s*dhcp-host\>" +syn match DnsmasqKeyword "^\s*dhcp-ignore\>" +syn match DnsmasqKeyword "^\s*dhcp-lease-max\>" +syn match DnsmasqKeyword "^\s*dhcp-leasefile\>" +syn match DnsmasqKeyword "^\s*dhcp-mac\>" +syn match DnsmasqKeyword "^\s*dhcp-match\>" syn match DnsmasqKeyword "^\s*dhcp-no-override\>" +syn match DnsmasqKeyword "^\s*dhcp-option-force\>" +syn match DnsmasqKeyword "^\s*dhcp-option\>" +syn match DnsmasqKeyword "^\s*dhcp-range\>" +syn match DnsmasqKeyword "^\s*dhcp-script\>" syn match DnsmasqKeyword "^\s*dhcp-scriptuser\>" +syn match DnsmasqKeyword "^\s*dhcp-userclass\>" +syn match DnsmasqKeyword "^\s*dhcp-vendorclass\>" syn match DnsmasqKeyword "^\s*domain-needed\>" +syn match DnsmasqKeyword "^\s*domain\>" syn match DnsmasqKeyword "^\s*enable-dbus\>" syn match DnsmasqKeyword "^\s*enable-tftp\>" +syn match DnsmasqKeyword "^\s*except-interface\>" syn match DnsmasqKeyword "^\s*expand-hosts\>" syn match DnsmasqKeyword "^\s*filterwin2k\>" +syn match DnsmasqKeyword "^\s*group\>" +syn match DnsmasqKeyword "^\s*interface\>" syn match DnsmasqKeyword "^\s*keep-in-foreground\>" syn match DnsmasqKeyword "^\s*leasefile-ro\>" +syn match DnsmasqKeyword "^\s*listen-address\>" +syn match DnsmasqKeyword "^\s*local-ttl\>" +syn match DnsmasqKeyword "^\s*local\>" syn match DnsmasqKeyword "^\s*localise-queries\>" syn match DnsmasqKeyword "^\s*localmx\>" syn match DnsmasqKeyword "^\s*log-dhcp\>" syn match DnsmasqKeyword "^\s*log-queries\>" +syn match DnsmasqKeyword "^\s*mx-host\>" +syn match DnsmasqKeyword "^\s*mx-target\>" syn match DnsmasqKeyword "^\s*no-daemon\>" +syn match DnsmasqKeyword "^\s*no-dhcp-interface\>" syn match DnsmasqKeyword "^\s*no-hosts\>" syn match DnsmasqKeyword "^\s*no-negcache\>" syn match DnsmasqKeyword "^\s*no-ping\>" syn match DnsmasqKeyword "^\s*no-poll\>" syn match DnsmasqKeyword "^\s*no-resolv\>" syn match DnsmasqKeyword "^\s*proxy-dnssec\>" +syn match DnsmasqKeyword "^\s*ptr-record\>" +syn match DnsmasqKeyword "^\s*pxe-prompt\>" +syn match DnsmasqKeyword "^\s*pxe-service\>" syn match DnsmasqKeyword "^\s*read-ethers\>" syn match DnsmasqKeyword "^\s*rebind-localhost-ok\>" +syn match DnsmasqKeyword "^\s*resolv-file\>" syn match DnsmasqKeyword "^\s*selfmx\>" +syn match DnsmasqKeyword "^\s*server\>" +syn match DnsmasqKeyword "^\s*srv-host\>" syn match DnsmasqKeyword "^\s*stop-dns-rebind\>" syn match DnsmasqKeyword "^\s*strict-order\>" syn match DnsmasqKeyword "^\s*tftp-no-blocksize\>" +syn match DnsmasqKeyword "^\s*tftp-root\>" syn match DnsmasqKeyword "^\s*tftp-secure\>" syn match DnsmasqKeyword "^\s*tftp-unique-root\>" +syn match DnsmasqKeyword "^\s*txt-record\>" +syn match DnsmasqKeyword "^\s*user\>" if b:dnsmasq_backrgound_light == 1 - hi def DnsmasqParams ctermfg=DarkGreen guifg=DarkGreen - hi def DnsmasqKeyword ctermfg=DarkGreen guifg=DarkGreen + hi def DnsmasqParams ctermfg=DarkGreen guifg=DarkGreen + hi def DnsmasqKeyword ctermfg=DarkGreen guifg=DarkGreen else hi def link DnsmasqKeyword Keyword hi def link DnsmasqParams Keyword endif -hi def link DnsmasqTodo Todo -hi def link DnsmasqSpecial Constant -hi def link DnsmasqComment Comment -hi def link DnsmasqString Constant -hi def link DnsmasqValues Normal -hi def link DnsmasqEq Constant +hi def link DnsmasqKeywordSpecial Type +hi def link DnsmasqTodo Todo +hi def link DnsmasqSpecial Constant +hi def link DnsmasqIPv4 Identifier +hi def link DnsmasqSubnet2 DnsmasqSubnet +hi def link DnsmasqSubnet DnsmasqMac +hi def link DnsmasqRange DnsmasqMac +hi def link DnsmasqMac Preproc +hi def link DnsmasqTime Preproc +hi def link DnsmasqComment Comment +hi def link DnsmasqString Constant +hi def link DnsmasqValues Normal + let b:current_syntax = "dnsmasq" + diff --git a/runtime/syntax/dot.vim b/runtime/syntax/dot.vim index 507f72e28..4cc6f4f21 100644 --- a/runtime/syntax/dot.vim +++ b/runtime/syntax/dot.vim @@ -3,7 +3,7 @@ " Filenames: *.dot " Maintainer: Markus Mottl <markus.mottl@gmail.com> " URL: http://www.ocaml.info/vim/syntax/dot.vim -" Last Change: 2006 Feb 05 +" Last Change: 2011 May 17 - improved identifier matching + two new keywords " 2001 May 04 - initial version " For version 5.x: Clear all syntax items @@ -47,10 +47,10 @@ syn keyword dotType shape shapefile sides skew width " Edge attributes syn keyword dotType arrowhead arrowsize arrowtail constraint decorateP -syn keyword dotType dir headclip headlabel labelangle labeldistance +syn keyword dotType dir headclip headlabel headport labelangle labeldistance syn keyword dotType labelfontcolor labelfontname labelfontsize syn keyword dotType minlen port_label_distance samehead sametail -syn keyword dotType tailclip taillabel weight +syn keyword dotType tailclip taillabel tailport weight " Shared attributes (graphs, nodes, edges) syn keyword dotType color @@ -67,7 +67,7 @@ syn match dotKeyChar ";" syn match dotKeyChar "->" " Identifier -syn match dotIdentifier /\<\w\+\>/ +syn match dotIdentifier /\<\w\+\(:\w\+\)\?\>/ " Synchronization syn sync minlines=50 diff --git a/runtime/syntax/gnash.vim b/runtime/syntax/gnash.vim index 413ebaa64..97d5aa4ce 100644 --- a/runtime/syntax/gnash.vim +++ b/runtime/syntax/gnash.vim @@ -2,7 +2,7 @@ " Language: gnash(1) configuration files " http://www.gnu.org/software/gnash/manual/gnashuser.html#gnashrc " Maintainer: Thilo Six <T.Six@gmx.de> -" Last Change: 2011 Apr 28 +" Last Change: 17 May 2011 " Credidts: derived from readline.vim " Nikolai Weibull " @@ -15,16 +15,12 @@ elseif exists ("b:current_syntax") finish endif -let s:cpo_save = &cpo -set cpo&vim - - syn case match - syn keyword GnashTodo contained TODO FIXME XXX NOTE -syn region GnashComment display oneline start='^\s*#' end='$' - \ contains=GnashTodo,@Spell +" Comments +syn match GnashComment "^#.*$" contains=GnashTodo +syn match GnashComment "\s#.*$" contains=GnashTodo syn match GnashNumber display '\<\d\+\>' @@ -84,16 +80,13 @@ syn match GnashKeyword '\<webcamDevice\>' syn match GnashKeyword '\<whitelist\>' syn match GnashKeyword '\<writelog\>' -hi def GnashOn ctermfg=Green guifg=Green -hi def GnashOff ctermfg=Red guifg=Red +hi def link GnashOn Identifier +hi def link GnashOff Preproc hi def link GnashComment Comment hi def link GnashTodo Todo hi def link GnashString String -hi def link GnashNumber Normal +hi def link GnashNumber Type hi def link GnashSet String hi def link GnashKeyword Keyword let b:current_syntax = "gnash" - -let &cpo = s:cpo_save -unlet s:cpo_save diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim index 27eb3907e..e2abc5524 100644 --- a/runtime/syntax/ocaml.vim +++ b/runtime/syntax/ocaml.vim @@ -5,9 +5,9 @@ " Karl-Heinz Sylla <Karl-Heinz.Sylla@gmd.de> " Issac Trotts <ijtrotts@ucdavis.edu> " URL: http://www.ocaml.info/vim/syntax/ocaml.vim -" Last Change: 2007 Apr 13 - Added highlighting of nativeints (MM) -" 2006 Oct 09 - More highlighting improvements to numbers (MM) -" 2006 Sep 19 - Improved highlighting of numbers (Florent Monnier) +" Last Change: 2010 Oct 11 - Added highlighting of lnot (MM, thanks to Erick Matsen) +" 2010 Sep 03 - Fixed escaping bug (MM, thanks to Florent Monnier) +" 2010 Aug 07 - Fixed module type bug (MM) " A minor patch was applied to the official version so that object/end " can be distinguished from begin/end, which is used for indentation, @@ -24,14 +24,14 @@ endif " OCaml is case sensitive. syn case match +" Access to the method of an object +syn match ocamlMethod "#" + " Script headers highlighted like comments syn match ocamlComment "^#!.*" " Scripting directives -syn match ocamlScript "^#\<\(quit\|labels\|warnings\|directory\|cd\|load\|use\|install_printer\|remove_printer\|require\|thread\|trace\|untrace\|untrace_all\|print_depth\|print_length\)\>" - -" Script headers highlighted like comments -syn match ocamlComment "^#!.*" +syn match ocamlScript "^#\<\(quit\|labels\|warnings\|directory\|cd\|load\|use\|install_printer\|remove_printer\|require\|thread\|trace\|untrace\|untrace_all\|print_depth\|print_length\|camlp4o\)\>" " lowercase identifier - the standard way to match syn match ocamlLCIdentifier /\<\(\l\|_\)\(\w\|'\)*\>/ @@ -69,7 +69,7 @@ syn cluster ocamlAllErrs contains=ocamlBraceErr,ocamlBrackErr,ocamlParenErr,oca syn cluster ocamlAENoParen contains=ocamlBraceErr,ocamlBrackErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr -syn cluster ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlModParam1,ocamlPreMPRestr,ocamlMPRestr,ocamlMPRestr1,ocamlMPRestr2,ocamlMPRestr3,ocamlModRHS,ocamlFuncWith,ocamlFuncStruct,ocamlModTypeRestr,ocamlModTRWith,ocamlWith,ocamlWithRest,ocamlModType,ocamlFullMod +syn cluster ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlModParam1,ocamlPreMPRestr,ocamlMPRestr,ocamlMPRestr1,ocamlMPRestr2,ocamlMPRestr3,ocamlModRHS,ocamlFuncWith,ocamlFuncStruct,ocamlModTypeRestr,ocamlModTRWith,ocamlWith,ocamlWithRest,ocamlModType,ocamlFullMod,ocamlVal " Enclosing delimiters @@ -109,9 +109,6 @@ syn region ocamlNone matchgroup=ocamlKeyword start="\<if\>" matchgroup=ocamlKe "" Modules -" "struct" -syn region ocamlStruct matchgroup=ocamlModule start="\<struct\>" matchgroup=ocamlModule end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr - " "sig" syn region ocamlSig matchgroup=ocamlModule start="\<sig\>" matchgroup=ocamlModule end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr,ocamlModule syn region ocamlModSpec matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contained contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlModTRWith,ocamlMPRestr @@ -124,8 +121,8 @@ syn match ocamlKeyword "\<include\>" skipwhite skipempty nextgroup=ocamlModPa " "module" - somewhat complicated stuff ;-) syn region ocamlModule matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlPreDef -syn region ocamlPreDef start="."me=e-1 matchgroup=ocamlKeyword end="\l\|="me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam,ocamlModTypeRestr,ocamlModTRWith nextgroup=ocamlModPreRHS -syn region ocamlModParam start="([^*]" end=")" contained contains=@ocamlAENoParen,ocamlModParam1 +syn region ocamlPreDef start="."me=e-1 matchgroup=ocamlKeyword end="\l\|=\|)"me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam,ocamlModTypeRestr,ocamlModTRWith nextgroup=ocamlModPreRHS +syn region ocamlModParam start="([^*]" end=")" contained contains=@ocamlAENoParen,ocamlModParam1,ocamlVal syn match ocamlModParam1 "\<\u\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=ocamlPreMPRestr syn region ocamlPreMPRestr start="."me=e-1 end=")"me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlMPRestr,ocamlModTypeRestr @@ -135,6 +132,8 @@ syn region ocamlMPRestr1 matchgroup=ocamlModule start="\ssig\s\=" matchgroup=o syn region ocamlMPRestr2 start="\sfunctor\(\s\|(\)\="me=e-1 matchgroup=ocamlKeyword end="->" contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam skipwhite skipempty nextgroup=ocamlFuncWith,ocamlMPRestr2 syn match ocamlMPRestr3 "\w\(\w\|'\)*\(\.\w\(\w\|'\)*\)*" contained syn match ocamlModPreRHS "=" contained skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod +syn keyword ocamlKeyword val +syn region ocamlVal matchgroup=ocamlKeyword start="\<val\>" matchgroup=ocamlLCIdentifier end="\<\l\(\w\|'\)*\>" contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlMPRestr syn region ocamlModRHS start="." end=".\w\|([^*]"me=e-2 contained contains=ocamlComment skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod syn match ocamlFullMod "\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*" contained skipwhite skipempty nextgroup=ocamlFuncWith @@ -146,8 +145,11 @@ syn region ocamlModTRWith start=":\s*("hs=s+1 end=")" contained contains=@ocam syn match ocamlWith "\<\(\u\(\w\|'\)*\.\)*\w\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=ocamlWithRest syn region ocamlWithRest start="[^)]" end=")"me=e-1 contained contains=ALLBUT,@ocamlContained +" "struct" +syn region ocamlStruct matchgroup=ocamlModule start="\<\(module\s\+\)\=struct\>" matchgroup=ocamlModule end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr + " "module type" -syn region ocamlKeyword start="\<module\>\s*\<type\>" matchgroup=ocamlModule end="\<\w\(\w\|'\)*\>" contains=ocamlComment skipwhite skipempty nextgroup=ocamlMTDef +syn region ocamlKeyword start="\<module\>\s*\<type\>\(\s*\<of\>\)\=" matchgroup=ocamlModule end="\<\w\(\w\|'\)*\>" contains=ocamlComment skipwhite skipempty nextgroup=ocamlMTDef syn match ocamlMTDef "=\s*\w\(\w\|'\)*\>"hs=s+1,me=s syn keyword ocamlKeyword and as assert class @@ -159,7 +161,7 @@ syn keyword ocamlKeyword land lazy let match syn keyword ocamlKeyword method mutable new of syn keyword ocamlKeyword parser private raise rec syn keyword ocamlKeyword try type -syn keyword ocamlKeyword val virtual when while with +syn keyword ocamlKeyword virtual when while with if exists("ocaml_revised") syn keyword ocamlKeyword do value @@ -174,7 +176,7 @@ syn keyword ocamlType array bool char exn float format format4 syn keyword ocamlType int int32 int64 lazy_t list nativeint option syn keyword ocamlType string unit -syn keyword ocamlOperator asr lor lsl lsr lxor mod not +syn keyword ocamlOperator asr lnot lor lsl lsr lxor mod not syn match ocamlConstructor "(\s*)" syn match ocamlConstructor "\[\s*\]" @@ -189,6 +191,7 @@ syn match ocamlConstructor "`\w\(\w\|'\)*\>" syn match ocamlModPath "\u\(\w\|'\)*\."he=e-1 syn match ocamlCharacter "'\\\d\d\d'\|'\\[\'ntbr]'\|'.'" +syn match ocamlCharacter "'\\x\x\x'" syn match ocamlCharErr "'\\\d\d'\|'\\\d'" syn match ocamlCharErr "'\\[^\'ntbr]'" syn region ocamlString start=+"+ skip=+\\\\\|\\"+ end=+"+ @@ -220,7 +223,7 @@ syn match ocamlNumber "\<-\=\d\(_\|\d\)*[l|L|n]\?\>" syn match ocamlNumber "\<-\=0[x|X]\(\x\|_\)\+[l|L|n]\?\>" syn match ocamlNumber "\<-\=0[o|O]\(\o\|_\)\+[l|L|n]\?\>" syn match ocamlNumber "\<-\=0[b|B]\([01]\|_\)\+[l|L|n]\?\>" -syn match ocamlFloat "\<-\=\d\(_\|\d\)*\.\(_\|\d\)*\([eE][-+]\=\d\(_\|\d\)*\)\=\>" +syn match ocamlFloat "\<-\=\d\(_\|\d\)*\.\?\(_\|\d\)*\([eE][-+]\=\d\(_\|\d\)*\)\=\>" " Labels syn match ocamlLabel "\~\(\l\|_\)\(\w\|'\)*"lc=1 @@ -294,6 +297,7 @@ if version >= 508 || !exists("did_ocaml_syntax_inits") HiLink ocamlConstructor Constant + HiLink ocamlVal Keyword HiLink ocamlModPreRHS Keyword HiLink ocamlMPRestr2 Keyword HiLink ocamlKeyword Keyword diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim index 233c8d9c5..a0904457a 100644 --- a/runtime/syntax/pfmain.vim +++ b/runtime/syntax/pfmain.vim @@ -1,10 +1,11 @@ " Vim syntax file " Language: Postfix main.cf configuration " Maintainer: KELEMEN Peter <Peter dot Kelemen at cern dot ch> -" Last Change: 2006 Apr 15 -" Version: 0.20 +" Last Update: Hong Xu +" Last Change: 2011 May 14 +" Version: 0.40 " URL: http://cern.ch/fuji/vim/syntax/pfmain.vim -" Comment: Based on Postfix 2.3.x defaults. +" Comment: Based on Postfix 2.9 defaults. if version < 600 syntax clear @@ -22,7 +23,9 @@ syntax case match syntax sync minlines=1 syntax keyword pfmainConf 2bounce_notice_recipient +syntax keyword pfmainConf access_map_defer_code syntax keyword pfmainConf access_map_reject_code +syntax keyword pfmainConf address_verify_cache_cleanup_interval syntax keyword pfmainConf address_verify_default_transport syntax keyword pfmainConf address_verify_local_transport syntax keyword pfmainConf address_verify_map @@ -36,6 +39,7 @@ syntax keyword pfmainConf address_verify_positive_refresh_time syntax keyword pfmainConf address_verify_relay_transport syntax keyword pfmainConf address_verify_relayhost syntax keyword pfmainConf address_verify_sender +syntax keyword pfmainConf address_verify_sender_dependent_default_transport_maps syntax keyword pfmainConf address_verify_sender_dependent_relayhost_maps syntax keyword pfmainConf address_verify_service_name syntax keyword pfmainConf address_verify_transport_maps @@ -83,22 +87,31 @@ syntax keyword pfmainConf connection_cache_service_name syntax keyword pfmainConf connection_cache_status_update_time syntax keyword pfmainConf connection_cache_ttl_limit syntax keyword pfmainConf content_filter +syntax keyword pfmainConf cyrus_sasl_config_path syntax keyword pfmainConf daemon_directory syntax keyword pfmainConf daemon_timeout +syntax keyword pfmainConf data_directory syntax keyword pfmainConf debug_peer_level syntax keyword pfmainConf debug_peer_list syntax keyword pfmainConf default_database_type syntax keyword pfmainConf default_delivery_slot_cost syntax keyword pfmainConf default_delivery_slot_discount syntax keyword pfmainConf default_delivery_slot_loan +syntax keyword pfmainConf default_destination_concurrency_failed_cohort_limit syntax keyword pfmainConf default_destination_concurrency_limit +syntax keyword pfmainConf default_destination_concurrency_negative_feedback +syntax keyword pfmainConf default_destination_concurrency_positive_feedback +syntax keyword pfmainConf default_destination_rate_delay syntax keyword pfmainConf default_destination_recipient_limit syntax keyword pfmainConf default_extra_recipient_limit +syntax keyword pfmainConf default_filter_nexthop syntax keyword pfmainConf default_minimum_delivery_slots syntax keyword pfmainConf default_privs syntax keyword pfmainConf default_process_limit syntax keyword pfmainConf default_rbl_reply syntax keyword pfmainConf default_recipient_limit +syntax keyword pfmainConf default_recipient_refill_delay +syntax keyword pfmainConf default_recipient_refill_limit syntax keyword pfmainConf default_transport syntax keyword pfmainConf default_verp_delimiters syntax keyword pfmainConf defer_code @@ -109,15 +122,22 @@ syntax keyword pfmainConf delay_notice_recipient syntax keyword pfmainConf delay_warning_time syntax keyword pfmainConf deliver_lock_attempts syntax keyword pfmainConf deliver_lock_delay +syntax keyword pfmainConf destination_concurrency_feedback_debug +syntax keyword pfmainConf detect_8bit_encoding_header syntax keyword pfmainConf disable_dns_lookups syntax keyword pfmainConf disable_mime_input_processing syntax keyword pfmainConf disable_mime_output_conversion syntax keyword pfmainConf disable_verp_bounces syntax keyword pfmainConf disable_vrfy_command +syntax keyword pfmainConf dnsblog_reply_delay +syntax keyword pfmainConf dnsblog_service_name syntax keyword pfmainConf dont_remove syntax keyword pfmainConf double_bounce_sender syntax keyword pfmainConf duplicate_filter_limit +syntax keyword pfmainConf empty_address_default_transport_maps_lookup_key syntax keyword pfmainConf empty_address_recipient +syntax keyword pfmainConf empty_address_relayhost_maps_lookup_key +syntax keyword pfmainConf enable_long_queue_ids syntax keyword pfmainConf enable_original_recipient syntax keyword pfmainConf error_notice_recipient syntax keyword pfmainConf error_service_name @@ -151,13 +171,16 @@ syntax keyword pfmainConf in_flow_delay syntax keyword pfmainConf inet_interfaces syntax keyword pfmainConf inet_protocols syntax keyword pfmainConf initial_destination_concurrency +syntax keyword pfmainConf internal_mail_filter_classes syntax keyword pfmainConf invalid_hostname_reject_code syntax keyword pfmainConf ipc_idle syntax keyword pfmainConf ipc_timeout syntax keyword pfmainConf ipc_ttl syntax keyword pfmainConf line_length_limit +syntax keyword pfmainConf lmtp_address_preference syntax keyword pfmainConf lmtp_bind_address syntax keyword pfmainConf lmtp_bind_address6 +syntax keyword pfmainConf lmtp_body_checks syntax keyword pfmainConf lmtp_cname_overrides_servername syntax keyword pfmainConf lmtp_connect_timeout syntax keyword pfmainConf lmtp_connection_cache_destinations @@ -172,23 +195,34 @@ syntax keyword pfmainConf lmtp_destination_concurrency_limit syntax keyword pfmainConf lmtp_destination_recipient_limit syntax keyword pfmainConf lmtp_discard_lhlo_keyword_address_maps syntax keyword pfmainConf lmtp_discard_lhlo_keywords +syntax keyword pfmainConf lmtp_dns_resolver_options syntax keyword pfmainConf lmtp_enforce_tls syntax keyword pfmainConf lmtp_generic_maps +syntax keyword pfmainConf lmtp_header_checks syntax keyword pfmainConf lmtp_host_lookup syntax keyword pfmainConf lmtp_lhlo_name syntax keyword pfmainConf lmtp_lhlo_timeout syntax keyword pfmainConf lmtp_line_length_limit syntax keyword pfmainConf lmtp_mail_timeout +syntax keyword pfmainConf lmtp_mime_header_checks syntax keyword pfmainConf lmtp_mx_address_limit syntax keyword pfmainConf lmtp_mx_session_limit +syntax keyword pfmainConf lmtp_nested_header_checks +syntax keyword pfmainConf lmtp_per_record_deadline syntax keyword pfmainConf lmtp_pix_workaround_delay_time +syntax keyword pfmainConf lmtp_pix_workaround_maps syntax keyword pfmainConf lmtp_pix_workaround_threshold_time +syntax keyword pfmainConf lmtp_pix_workarounds syntax keyword pfmainConf lmtp_quit_timeout syntax keyword pfmainConf lmtp_quote_rfc821_envelope syntax keyword pfmainConf lmtp_randomize_addresses syntax keyword pfmainConf lmtp_rcpt_timeout +syntax keyword pfmainConf lmtp_reply_filter syntax keyword pfmainConf lmtp_rset_timeout +syntax keyword pfmainConf lmtp_sasl_auth_cache_name +syntax keyword pfmainConf lmtp_sasl_auth_cache_time syntax keyword pfmainConf lmtp_sasl_auth_enable +syntax keyword pfmainConf lmtp_sasl_auth_soft_bounce syntax keyword pfmainConf lmtp_sasl_mechanism_filter syntax keyword pfmainConf lmtp_sasl_password_maps syntax keyword pfmainConf lmtp_sasl_path @@ -201,10 +235,34 @@ syntax keyword pfmainConf lmtp_sender_dependent_authentication syntax keyword pfmainConf lmtp_skip_5xx_greeting syntax keyword pfmainConf lmtp_starttls_timeout syntax keyword pfmainConf lmtp_tcp_port +syntax keyword pfmainConf lmtp_tls_CAfile +syntax keyword pfmainConf lmtp_tls_CApath +syntax keyword pfmainConf lmtp_tls_block_early_mail_reply +syntax keyword pfmainConf lmtp_tls_cert_file +syntax keyword pfmainConf lmtp_tls_ciphers +syntax keyword pfmainConf lmtp_tls_dcert_file +syntax keyword pfmainConf lmtp_tls_dkey_file +syntax keyword pfmainConf lmtp_tls_eccert_file +syntax keyword pfmainConf lmtp_tls_eckey_file syntax keyword pfmainConf lmtp_tls_enforce_peername +syntax keyword pfmainConf lmtp_tls_exclude_ciphers +syntax keyword pfmainConf lmtp_tls_fingerprint_cert_match +syntax keyword pfmainConf lmtp_tls_fingerprint_digest +syntax keyword pfmainConf lmtp_tls_key_file +syntax keyword pfmainConf lmtp_tls_loglevel +syntax keyword pfmainConf lmtp_tls_mandatory_ciphers +syntax keyword pfmainConf lmtp_tls_mandatory_exclude_ciphers +syntax keyword pfmainConf lmtp_tls_mandatory_protocols syntax keyword pfmainConf lmtp_tls_note_starttls_offer syntax keyword pfmainConf lmtp_tls_per_site +syntax keyword pfmainConf lmtp_tls_policy_maps +syntax keyword pfmainConf lmtp_tls_protocols syntax keyword pfmainConf lmtp_tls_scert_verifydepth +syntax keyword pfmainConf lmtp_tls_secure_cert_match +syntax keyword pfmainConf lmtp_tls_security_level +syntax keyword pfmainConf lmtp_tls_session_cache_database +syntax keyword pfmainConf lmtp_tls_session_cache_timeout +syntax keyword pfmainConf lmtp_tls_verify_cert_match syntax keyword pfmainConf lmtp_use_tls syntax keyword pfmainConf lmtp_xforward_timeout syntax keyword pfmainConf local_command_shell @@ -229,6 +287,7 @@ syntax keyword pfmainConf mailq_path syntax keyword pfmainConf manpage_directory syntax keyword pfmainConf maps_rbl_domains syntax keyword pfmainConf maps_rbl_reject_code +syntax keyword pfmainConf master_service_disable syntax keyword pfmainConf masquerade_classes syntax keyword pfmainConf masquerade_domains syntax keyword pfmainConf masquerade_exceptions @@ -239,10 +298,31 @@ syntax keyword pfmainConf maximal_queue_lifetime syntax keyword pfmainConf message_reject_characters syntax keyword pfmainConf message_size_limit syntax keyword pfmainConf message_strip_characters +syntax keyword pfmainConf milter_command_timeout +syntax keyword pfmainConf milter_connect_macros +syntax keyword pfmainConf milter_connect_timeout +syntax keyword pfmainConf milter_content_timeout +syntax keyword pfmainConf milter_data_macros +syntax keyword pfmainConf milter_default_action +syntax keyword pfmainConf milter_end_of_data_macros +syntax keyword pfmainConf milter_end_of_header_macros +syntax keyword pfmainConf milter_header_checks +syntax keyword pfmainConf milter_helo_macros +syntax keyword pfmainConf milter_macro_daemon_name +syntax keyword pfmainConf milter_macro_v +syntax keyword pfmainConf milter_mail_macros +syntax keyword pfmainConf milter_protocol +syntax keyword pfmainConf milter_rcpt_macros +syntax keyword pfmainConf milter_unknown_command_macros syntax keyword pfmainConf mime_boundary_length_limit syntax keyword pfmainConf mime_header_checks syntax keyword pfmainConf mime_nesting_limit syntax keyword pfmainConf minimal_backoff_time +syntax keyword pfmainConf multi_instance_directories +syntax keyword pfmainConf multi_instance_enable +syntax keyword pfmainConf multi_instance_group +syntax keyword pfmainConf multi_instance_name +syntax keyword pfmainConf multi_instance_wrapper syntax keyword pfmainConf multi_recipient_bounce_reject_code syntax keyword pfmainConf mydestination syntax keyword pfmainConf mydomain @@ -253,23 +333,74 @@ syntax keyword pfmainConf myorigin syntax keyword pfmainConf nested_header_checks syntax keyword pfmainConf newaliases_path syntax keyword pfmainConf non_fqdn_reject_code +syntax keyword pfmainConf non_smtpd_milters syntax keyword pfmainConf notify_classes syntax keyword pfmainConf owner_request_special syntax keyword pfmainConf parent_domain_matches_subdomains syntax keyword pfmainConf permit_mx_backup_networks syntax keyword pfmainConf pickup_service_name syntax keyword pfmainConf plaintext_reject_code +syntax keyword pfmainConf postmulti_control_commands +syntax keyword pfmainConf postmulti_start_commands +syntax keyword pfmainConf postmulti_stop_commands +syntax keyword pfmainConf postscreen_access_list +syntax keyword pfmainConf postscreen_bare_newline_action +syntax keyword pfmainConf postscreen_bare_newline_enable +syntax keyword pfmainConf postscreen_bare_newline_ttl +syntax keyword pfmainConf postscreen_blacklist_action +syntax keyword pfmainConf postscreen_cache_cleanup_interval +syntax keyword pfmainConf postscreen_cache_map +syntax keyword pfmainConf postscreen_cache_retention_time +syntax keyword pfmainConf postscreen_client_connection_count_limit +syntax keyword pfmainConf postscreen_command_count_limit +syntax keyword pfmainConf postscreen_command_filter +syntax keyword pfmainConf postscreen_command_time_limit +syntax keyword pfmainConf postscreen_disable_vrfy_command +syntax keyword pfmainConf postscreen_discard_ehlo_keyword_address_maps +syntax keyword pfmainConf postscreen_discard_ehlo_keywords +syntax keyword pfmainConf postscreen_dnsbl_action +syntax keyword pfmainConf postscreen_dnsbl_reply_map +syntax keyword pfmainConf postscreen_dnsbl_sites +syntax keyword pfmainConf postscreen_dnsbl_threshold +syntax keyword pfmainConf postscreen_dnsbl_ttl +syntax keyword pfmainConf postscreen_enforce_tls +syntax keyword pfmainConf postscreen_expansion_filter +syntax keyword pfmainConf postscreen_forbidden_commands +syntax keyword pfmainConf postscreen_greet_action +syntax keyword pfmainConf postscreen_greet_banner +syntax keyword pfmainConf postscreen_greet_ttl +syntax keyword pfmainConf postscreen_greet_wait +syntax keyword pfmainConf postscreen_helo_required +syntax keyword pfmainConf postscreen_non_smtp_command_action +syntax keyword pfmainConf postscreen_non_smtp_command_enable +syntax keyword pfmainConf postscreen_non_smtp_command_ttl +syntax keyword pfmainConf postscreen_pipelining_action +syntax keyword pfmainConf postscreen_pipelining_enable +syntax keyword pfmainConf postscreen_pipelining_ttl +syntax keyword pfmainConf postscreen_post_queue_limit +syntax keyword pfmainConf postscreen_pre_queue_limit +syntax keyword pfmainConf postscreen_reject_footer +syntax keyword pfmainConf postscreen_tls_security_level +syntax keyword pfmainConf postscreen_use_tls +syntax keyword pfmainConf postscreen_watchdog_timeout +syntax keyword pfmainConf postscreen_whitelist_interfaces syntax keyword pfmainConf prepend_delivered_header +syntax keyword pfmainConf process_id syntax keyword pfmainConf process_id_directory +syntax keyword pfmainConf process_name syntax keyword pfmainConf propagate_unmatched_extensions syntax keyword pfmainConf proxy_interfaces syntax keyword pfmainConf proxy_read_maps +syntax keyword pfmainConf proxy_write_maps +syntax keyword pfmainConf proxymap_service_name +syntax keyword pfmainConf proxywrite_service_name syntax keyword pfmainConf qmgr_clog_warn_time syntax keyword pfmainConf qmgr_fudge_factor syntax keyword pfmainConf qmgr_message_active_limit syntax keyword pfmainConf qmgr_message_recipient_limit syntax keyword pfmainConf qmgr_message_recipient_minimum syntax keyword pfmainConf qmqpd_authorized_clients +syntax keyword pfmainConf qmqpd_client_port_logging syntax keyword pfmainConf qmqpd_error_delay syntax keyword pfmainConf qmqpd_timeout syntax keyword pfmainConf queue_directory @@ -285,6 +416,7 @@ syntax keyword pfmainConf recipient_canonical_classes syntax keyword pfmainConf recipient_canonical_maps syntax keyword pfmainConf recipient_delimiter syntax keyword pfmainConf reject_code +syntax keyword pfmainConf reject_tempfail_action syntax keyword pfmainConf relay_clientcerts syntax keyword pfmainConf relay_destination_concurrency_limit syntax keyword pfmainConf relay_destination_recipient_limit @@ -296,23 +428,28 @@ syntax keyword pfmainConf relayhost syntax keyword pfmainConf relocated_maps syntax keyword pfmainConf remote_header_rewrite_domain syntax keyword pfmainConf require_home_directory +syntax keyword pfmainConf reset_owner_alias syntax keyword pfmainConf resolve_dequoted_address syntax keyword pfmainConf resolve_null_domain syntax keyword pfmainConf resolve_numeric_domain syntax keyword pfmainConf rewrite_service_name syntax keyword pfmainConf sample_directory +syntax keyword pfmainConf send_cyrus_sasl_authzid syntax keyword pfmainConf sender_bcc_maps syntax keyword pfmainConf sender_canonical_classes syntax keyword pfmainConf sender_canonical_maps +syntax keyword pfmainConf sender_dependent_default_transport_maps syntax keyword pfmainConf sender_dependent_relayhost_maps syntax keyword pfmainConf sendmail_path syntax keyword pfmainConf service_throttle_time syntax keyword pfmainConf setgid_group syntax keyword pfmainConf show_user_unknown_table_name syntax keyword pfmainConf showq_service_name +syntax keyword pfmainConf smtp_address_preference syntax keyword pfmainConf smtp_always_send_ehlo syntax keyword pfmainConf smtp_bind_address syntax keyword pfmainConf smtp_bind_address6 +syntax keyword pfmainConf smtp_body_checks syntax keyword pfmainConf smtp_cname_overrides_servername syntax keyword pfmainConf smtp_connect_timeout syntax keyword pfmainConf smtp_connection_cache_destinations @@ -327,25 +464,35 @@ syntax keyword pfmainConf smtp_destination_concurrency_limit syntax keyword pfmainConf smtp_destination_recipient_limit syntax keyword pfmainConf smtp_discard_ehlo_keyword_address_maps syntax keyword pfmainConf smtp_discard_ehlo_keywords +syntax keyword pfmainConf smtp_dns_resolver_options syntax keyword pfmainConf smtp_enforce_tls syntax keyword pfmainConf smtp_fallback_relay syntax keyword pfmainConf smtp_generic_maps +syntax keyword pfmainConf smtp_header_checks syntax keyword pfmainConf smtp_helo_name syntax keyword pfmainConf smtp_helo_timeout syntax keyword pfmainConf smtp_host_lookup syntax keyword pfmainConf smtp_line_length_limit syntax keyword pfmainConf smtp_mail_timeout +syntax keyword pfmainConf smtp_mime_header_checks syntax keyword pfmainConf smtp_mx_address_limit syntax keyword pfmainConf smtp_mx_session_limit +syntax keyword pfmainConf smtp_nested_header_checks syntax keyword pfmainConf smtp_never_send_ehlo syntax keyword pfmainConf smtp_pix_workaround_delay_time +syntax keyword pfmainConf smtp_pix_workaround_maps syntax keyword pfmainConf smtp_pix_workaround_threshold_time +syntax keyword pfmainConf smtp_pix_workarounds syntax keyword pfmainConf smtp_quit_timeout syntax keyword pfmainConf smtp_quote_rfc821_envelope syntax keyword pfmainConf smtp_randomize_addresses syntax keyword pfmainConf smtp_rcpt_timeout +syntax keyword pfmainConf smtp_reply_filter syntax keyword pfmainConf smtp_rset_timeout +syntax keyword pfmainConf smtp_sasl_auth_cache_name +syntax keyword pfmainConf smtp_sasl_auth_cache_time syntax keyword pfmainConf smtp_sasl_auth_enable +syntax keyword pfmainConf smtp_sasl_auth_soft_bounce syntax keyword pfmainConf smtp_sasl_mechanism_filter syntax keyword pfmainConf smtp_sasl_password_maps syntax keyword pfmainConf smtp_sasl_path @@ -360,18 +507,33 @@ syntax keyword pfmainConf smtp_skip_quit_response syntax keyword pfmainConf smtp_starttls_timeout syntax keyword pfmainConf smtp_tls_CAfile syntax keyword pfmainConf smtp_tls_CApath +syntax keyword pfmainConf smtp_tls_block_early_mail_reply syntax keyword pfmainConf smtp_tls_cert_file syntax keyword pfmainConf smtp_tls_cipherlist +syntax keyword pfmainConf smtp_tls_ciphers syntax keyword pfmainConf smtp_tls_dcert_file syntax keyword pfmainConf smtp_tls_dkey_file +syntax keyword pfmainConf smtp_tls_eccert_file +syntax keyword pfmainConf smtp_tls_eckey_file syntax keyword pfmainConf smtp_tls_enforce_peername +syntax keyword pfmainConf smtp_tls_exclude_ciphers +syntax keyword pfmainConf smtp_tls_fingerprint_cert_match +syntax keyword pfmainConf smtp_tls_fingerprint_digest syntax keyword pfmainConf smtp_tls_key_file syntax keyword pfmainConf smtp_tls_loglevel +syntax keyword pfmainConf smtp_tls_mandatory_ciphers +syntax keyword pfmainConf smtp_tls_mandatory_exclude_ciphers +syntax keyword pfmainConf smtp_tls_mandatory_protocols syntax keyword pfmainConf smtp_tls_note_starttls_offer syntax keyword pfmainConf smtp_tls_per_site +syntax keyword pfmainConf smtp_tls_policy_maps +syntax keyword pfmainConf smtp_tls_protocols syntax keyword pfmainConf smtp_tls_scert_verifydepth +syntax keyword pfmainConf smtp_tls_secure_cert_match +syntax keyword pfmainConf smtp_tls_security_level syntax keyword pfmainConf smtp_tls_session_cache_database syntax keyword pfmainConf smtp_tls_session_cache_timeout +syntax keyword pfmainConf smtp_tls_verify_cert_match syntax keyword pfmainConf smtp_use_tls syntax keyword pfmainConf smtp_xforward_timeout syntax keyword pfmainConf smtpd_authorized_verp_clients @@ -383,8 +545,10 @@ syntax keyword pfmainConf smtpd_client_connection_rate_limit syntax keyword pfmainConf smtpd_client_event_limit_exceptions syntax keyword pfmainConf smtpd_client_message_rate_limit syntax keyword pfmainConf smtpd_client_new_tls_session_rate_limit +syntax keyword pfmainConf smtpd_client_port_logging syntax keyword pfmainConf smtpd_client_recipient_rate_limit syntax keyword pfmainConf smtpd_client_restrictions +syntax keyword pfmainConf smtpd_command_filter syntax keyword pfmainConf smtpd_data_restrictions syntax keyword pfmainConf smtpd_delay_open_until_valid_rcpt syntax keyword pfmainConf smtpd_delay_reject @@ -401,18 +565,22 @@ syntax keyword pfmainConf smtpd_helo_required syntax keyword pfmainConf smtpd_helo_restrictions syntax keyword pfmainConf smtpd_history_flush_threshold syntax keyword pfmainConf smtpd_junk_command_limit +syntax keyword pfmainConf smtpd_milters syntax keyword pfmainConf smtpd_noop_commands syntax keyword pfmainConf smtpd_null_access_lookup_key syntax keyword pfmainConf smtpd_peername_lookup +syntax keyword pfmainConf smtpd_per_record_deadline syntax keyword pfmainConf smtpd_policy_service_max_idle syntax keyword pfmainConf smtpd_policy_service_max_ttl syntax keyword pfmainConf smtpd_policy_service_timeout syntax keyword pfmainConf smtpd_proxy_ehlo syntax keyword pfmainConf smtpd_proxy_filter +syntax keyword pfmainConf smtpd_proxy_options syntax keyword pfmainConf smtpd_proxy_timeout syntax keyword pfmainConf smtpd_recipient_limit syntax keyword pfmainConf smtpd_recipient_overshoot_limit syntax keyword pfmainConf smtpd_recipient_restrictions +syntax keyword pfmainConf smtpd_reject_footer syntax keyword pfmainConf smtpd_reject_unlisted_recipient syntax keyword pfmainConf smtpd_reject_unlisted_sender syntax keyword pfmainConf smtpd_restriction_classes @@ -426,59 +594,142 @@ syntax keyword pfmainConf smtpd_sasl_tls_security_options syntax keyword pfmainConf smtpd_sasl_type syntax keyword pfmainConf smtpd_sender_login_maps syntax keyword pfmainConf smtpd_sender_restrictions +syntax keyword pfmainConf smtpd_service_name syntax keyword pfmainConf smtpd_soft_error_limit syntax keyword pfmainConf smtpd_starttls_timeout syntax keyword pfmainConf smtpd_timeout syntax keyword pfmainConf smtpd_tls_CAfile syntax keyword pfmainConf smtpd_tls_CApath +syntax keyword pfmainConf smtpd_tls_always_issue_session_ids syntax keyword pfmainConf smtpd_tls_ask_ccert syntax keyword pfmainConf smtpd_tls_auth_only syntax keyword pfmainConf smtpd_tls_ccert_verifydepth syntax keyword pfmainConf smtpd_tls_cert_file syntax keyword pfmainConf smtpd_tls_cipherlist +syntax keyword pfmainConf smtpd_tls_ciphers syntax keyword pfmainConf smtpd_tls_dcert_file syntax keyword pfmainConf smtpd_tls_dh1024_param_file syntax keyword pfmainConf smtpd_tls_dh512_param_file syntax keyword pfmainConf smtpd_tls_dkey_file +syntax keyword pfmainConf smtpd_tls_eccert_file +syntax keyword pfmainConf smtpd_tls_eckey_file +syntax keyword pfmainConf smtpd_tls_eecdh_grade +syntax keyword pfmainConf smtpd_tls_exclude_ciphers +syntax keyword pfmainConf smtpd_tls_fingerprint_digest syntax keyword pfmainConf smtpd_tls_key_file syntax keyword pfmainConf smtpd_tls_loglevel +syntax keyword pfmainConf smtpd_tls_mandatory_ciphers +syntax keyword pfmainConf smtpd_tls_mandatory_exclude_ciphers +syntax keyword pfmainConf smtpd_tls_mandatory_protocols +syntax keyword pfmainConf smtpd_tls_protocols syntax keyword pfmainConf smtpd_tls_received_header syntax keyword pfmainConf smtpd_tls_req_ccert +syntax keyword pfmainConf smtpd_tls_security_level syntax keyword pfmainConf smtpd_tls_session_cache_database syntax keyword pfmainConf smtpd_tls_session_cache_timeout syntax keyword pfmainConf smtpd_tls_wrappermode syntax keyword pfmainConf smtpd_use_tls syntax keyword pfmainConf soft_bounce syntax keyword pfmainConf stale_lock_time +syntax keyword pfmainConf stress syntax keyword pfmainConf strict_7bit_headers syntax keyword pfmainConf strict_8bitmime syntax keyword pfmainConf strict_8bitmime_body syntax keyword pfmainConf strict_mime_encoding_domain syntax keyword pfmainConf strict_rfc821_envelopes +syntax keyword pfmainConf strict_7bit_headers +syntax keyword pfmainConf strict_8bitmime +syntax keyword pfmainConf strict_8bitmime_body +syntax keyword pfmainConf strict_mailbox_ownership +syntax keyword pfmainConf strict_mime_encoding_domain +syntax keyword pfmainConf strict_rfc821_envelopes syntax keyword pfmainConf sun_mailtool_compatibility syntax keyword pfmainConf swap_bangpath syntax keyword pfmainConf syslog_facility syntax keyword pfmainConf syslog_name +syntax keyword pfmainConf tcp_windowsize +syntax keyword pfmainConf tls_append_default_CA syntax keyword pfmainConf tls_daemon_random_bytes +syntax keyword pfmainConf tls_disable_workarounds +syntax keyword pfmainConf tls_eecdh_strong_curve +syntax keyword pfmainConf tls_eecdh_ultra_curve +syntax keyword pfmainConf tls_export_cipherlist +syntax keyword pfmainConf tls_high_cipherlist +syntax keyword pfmainConf tls_low_cipherlist +syntax keyword pfmainConf tls_medium_cipherlist +syntax keyword pfmainConf tls_null_cipherlist +syntax keyword pfmainConf tls_preempt_cipherlist syntax keyword pfmainConf tls_random_bytes syntax keyword pfmainConf tls_random_exchange_name syntax keyword pfmainConf tls_random_prng_update_period syntax keyword pfmainConf tls_random_reseed_period syntax keyword pfmainConf tls_random_source +syntax keyword pfmainConf tlsproxy_enforce_tls +syntax keyword pfmainConf tlsproxy_service_name +syntax keyword pfmainConf tlsproxy_tls_CAfile +syntax keyword pfmainConf tlsproxy_tls_CApath +syntax keyword pfmainConf tlsproxy_tls_always_issue_session_ids +syntax keyword pfmainConf tlsproxy_tls_ask_ccert +syntax keyword pfmainConf tlsproxy_tls_ccert_verifydepth +syntax keyword pfmainConf tlsproxy_tls_cert_file +syntax keyword pfmainConf tlsproxy_tls_ciphers +syntax keyword pfmainConf tlsproxy_tls_dcert_file +syntax keyword pfmainConf tlsproxy_tls_dh1024_param_file +syntax keyword pfmainConf tlsproxy_tls_dh512_param_file +syntax keyword pfmainConf tlsproxy_tls_dkey_file +syntax keyword pfmainConf tlsproxy_tls_eccert_file +syntax keyword pfmainConf tlsproxy_tls_eckey_file +syntax keyword pfmainConf tlsproxy_tls_eecdh_grade +syntax keyword pfmainConf tlsproxy_tls_exclude_ciphers +syntax keyword pfmainConf tlsproxy_tls_fingerprint_digest +syntax keyword pfmainConf tlsproxy_tls_key_file +syntax keyword pfmainConf tlsproxy_tls_loglevel +syntax keyword pfmainConf tlsproxy_tls_mandatory_ciphers +syntax keyword pfmainConf tlsproxy_tls_mandatory_exclude_ciphers +syntax keyword pfmainConf tlsproxy_tls_mandatory_protocols +syntax keyword pfmainConf tlsproxy_tls_protocols +syntax keyword pfmainConf tlsproxy_tls_req_ccert +syntax keyword pfmainConf tlsproxy_tls_security_level +syntax keyword pfmainConf tlsproxy_tls_session_cache_timeout +syntax keyword pfmainConf tlsproxy_use_tls +syntax keyword pfmainConf tlsproxy_watchdog_timeout syntax keyword pfmainConf trace_service_name +syntax keyword pfmainConf transport_delivery_slot_cost +syntax keyword pfmainConf transport_delivery_slot_discount +syntax keyword pfmainConf transport_delivery_slot_loan +syntax keyword pfmainConf transport_destination_concurrency_failed_cohort_limit +syntax keyword pfmainConf transport_destination_concurrency_limit +syntax keyword pfmainConf transport_destination_concurrency_negative_feedback +syntax keyword pfmainConf transport_destination_concurrency_positive_feedback +syntax keyword pfmainConf transport_destination_rate_delay +syntax keyword pfmainConf transport_destination_recipient_limit +syntax keyword pfmainConf transport_extra_recipient_limit +syntax keyword pfmainConf transport_initial_destination_concurrency syntax keyword pfmainConf transport_maps +syntax keyword pfmainConf transport_minimum_delivery_slots +syntax keyword pfmainConf transport_recipient_limit +syntax keyword pfmainConf transport_recipient_refill_delay +syntax keyword pfmainConf transport_recipient_refill_limit syntax keyword pfmainConf transport_retry_time syntax keyword pfmainConf trigger_timeout syntax keyword pfmainConf undisclosed_recipients_header syntax keyword pfmainConf unknown_address_reject_code +syntax keyword pfmainConf unknown_address_tempfail_action syntax keyword pfmainConf unknown_client_reject_code +syntax keyword pfmainConf unknown_helo_hostname_tempfail_action syntax keyword pfmainConf unknown_hostname_reject_code syntax keyword pfmainConf unknown_local_recipient_reject_code syntax keyword pfmainConf unknown_relay_recipient_reject_code syntax keyword pfmainConf unknown_virtual_alias_reject_code syntax keyword pfmainConf unknown_virtual_mailbox_reject_code +syntax keyword pfmainConf unverified_recipient_defer_code syntax keyword pfmainConf unverified_recipient_reject_code +syntax keyword pfmainConf unverified_recipient_reject_reason +syntax keyword pfmainConf unverified_recipient_tempfail_action +syntax keyword pfmainConf unverified_sender_defer_code syntax keyword pfmainConf unverified_sender_reject_code +syntax keyword pfmainConf unverified_sender_reject_reason +syntax keyword pfmainConf unverified_sender_tempfail_action syntax keyword pfmainConf verp_delimiter_filter syntax keyword pfmainConf virtual_alias_domains syntax keyword pfmainConf virtual_alias_expansion_limit @@ -496,7 +747,9 @@ syntax keyword pfmainConf virtual_minimum_uid syntax keyword pfmainConf virtual_transport syntax keyword pfmainConf virtual_uid_maps syntax match pfmainRef "$\<2bounce_notice_recipient\>" +syntax match pfmainRef "$\<access_map_defer_code\>" syntax match pfmainRef "$\<access_map_reject_code\>" +syntax match pfmainRef "$\<address_verify_cache_cleanup_interval\>" syntax match pfmainRef "$\<address_verify_default_transport\>" syntax match pfmainRef "$\<address_verify_local_transport\>" syntax match pfmainRef "$\<address_verify_map\>" @@ -510,6 +763,7 @@ syntax match pfmainRef "$\<address_verify_positive_refresh_time\>" syntax match pfmainRef "$\<address_verify_relay_transport\>" syntax match pfmainRef "$\<address_verify_relayhost\>" syntax match pfmainRef "$\<address_verify_sender\>" +syntax match pfmainRef "$\<address_verify_sender_dependent_default_transport_maps\>" syntax match pfmainRef "$\<address_verify_sender_dependent_relayhost_maps\>" syntax match pfmainRef "$\<address_verify_service_name\>" syntax match pfmainRef "$\<address_verify_transport_maps\>" @@ -557,22 +811,31 @@ syntax match pfmainRef "$\<connection_cache_service_name\>" syntax match pfmainRef "$\<connection_cache_status_update_time\>" syntax match pfmainRef "$\<connection_cache_ttl_limit\>" syntax match pfmainRef "$\<content_filter\>" +syntax match pfmainRef "$\<cyrus_sasl_config_path\>" syntax match pfmainRef "$\<daemon_directory\>" syntax match pfmainRef "$\<daemon_timeout\>" +syntax match pfmainRef "$\<data_directory\>" syntax match pfmainRef "$\<debug_peer_level\>" syntax match pfmainRef "$\<debug_peer_list\>" syntax match pfmainRef "$\<default_database_type\>" syntax match pfmainRef "$\<default_delivery_slot_cost\>" syntax match pfmainRef "$\<default_delivery_slot_discount\>" syntax match pfmainRef "$\<default_delivery_slot_loan\>" +syntax match pfmainRef "$\<default_destination_concurrency_failed_cohort_limit\>" syntax match pfmainRef "$\<default_destination_concurrency_limit\>" +syntax match pfmainRef "$\<default_destination_concurrency_negative_feedback\>" +syntax match pfmainRef "$\<default_destination_concurrency_positive_feedback\>" +syntax match pfmainRef "$\<default_destination_rate_delay\>" syntax match pfmainRef "$\<default_destination_recipient_limit\>" syntax match pfmainRef "$\<default_extra_recipient_limit\>" +syntax match pfmainRef "$\<default_filter_nexthop\>" syntax match pfmainRef "$\<default_minimum_delivery_slots\>" syntax match pfmainRef "$\<default_privs\>" syntax match pfmainRef "$\<default_process_limit\>" syntax match pfmainRef "$\<default_rbl_reply\>" syntax match pfmainRef "$\<default_recipient_limit\>" +syntax match pfmainRef "$\<default_recipient_refill_delay\>" +syntax match pfmainRef "$\<default_recipient_refill_limit\>" syntax match pfmainRef "$\<default_transport\>" syntax match pfmainRef "$\<default_verp_delimiters\>" syntax match pfmainRef "$\<defer_code\>" @@ -583,15 +846,22 @@ syntax match pfmainRef "$\<delay_notice_recipient\>" syntax match pfmainRef "$\<delay_warning_time\>" syntax match pfmainRef "$\<deliver_lock_attempts\>" syntax match pfmainRef "$\<deliver_lock_delay\>" +syntax match pfmainRef "$\<destination_concurrency_feedback_debug\>" +syntax match pfmainRef "$\<detect_8bit_encoding_header\>" syntax match pfmainRef "$\<disable_dns_lookups\>" syntax match pfmainRef "$\<disable_mime_input_processing\>" syntax match pfmainRef "$\<disable_mime_output_conversion\>" syntax match pfmainRef "$\<disable_verp_bounces\>" syntax match pfmainRef "$\<disable_vrfy_command\>" +syntax match pfmainRef "$\<dnsblog_reply_delay\>" +syntax match pfmainRef "$\<dnsblog_service_name\>" syntax match pfmainRef "$\<dont_remove\>" syntax match pfmainRef "$\<double_bounce_sender\>" syntax match pfmainRef "$\<duplicate_filter_limit\>" +syntax match pfmainRef "$\<empty_address_default_transport_maps_lookup_key\>" syntax match pfmainRef "$\<empty_address_recipient\>" +syntax match pfmainRef "$\<empty_address_relayhost_maps_lookup_key\>" +syntax match pfmainRef "$\<enable_long_queue_ids\>" syntax match pfmainRef "$\<enable_original_recipient\>" syntax match pfmainRef "$\<error_notice_recipient\>" syntax match pfmainRef "$\<error_service_name\>" @@ -625,13 +895,16 @@ syntax match pfmainRef "$\<in_flow_delay\>" syntax match pfmainRef "$\<inet_interfaces\>" syntax match pfmainRef "$\<inet_protocols\>" syntax match pfmainRef "$\<initial_destination_concurrency\>" +syntax match pfmainRef "$\<internal_mail_filter_classes\>" syntax match pfmainRef "$\<invalid_hostname_reject_code\>" syntax match pfmainRef "$\<ipc_idle\>" syntax match pfmainRef "$\<ipc_timeout\>" syntax match pfmainRef "$\<ipc_ttl\>" syntax match pfmainRef "$\<line_length_limit\>" +syntax match pfmainRef "$\<lmtp_address_preference\>" syntax match pfmainRef "$\<lmtp_bind_address\>" syntax match pfmainRef "$\<lmtp_bind_address6\>" +syntax match pfmainRef "$\<lmtp_body_checks\>" syntax match pfmainRef "$\<lmtp_cname_overrides_servername\>" syntax match pfmainRef "$\<lmtp_connect_timeout\>" syntax match pfmainRef "$\<lmtp_connection_cache_destinations\>" @@ -646,23 +919,34 @@ syntax match pfmainRef "$\<lmtp_destination_concurrency_limit\>" syntax match pfmainRef "$\<lmtp_destination_recipient_limit\>" syntax match pfmainRef "$\<lmtp_discard_lhlo_keyword_address_maps\>" syntax match pfmainRef "$\<lmtp_discard_lhlo_keywords\>" +syntax match pfmainRef "$\<lmtp_dns_resolver_options\>" syntax match pfmainRef "$\<lmtp_enforce_tls\>" syntax match pfmainRef "$\<lmtp_generic_maps\>" +syntax match pfmainRef "$\<lmtp_header_checks\>" syntax match pfmainRef "$\<lmtp_host_lookup\>" syntax match pfmainRef "$\<lmtp_lhlo_name\>" syntax match pfmainRef "$\<lmtp_lhlo_timeout\>" syntax match pfmainRef "$\<lmtp_line_length_limit\>" syntax match pfmainRef "$\<lmtp_mail_timeout\>" +syntax match pfmainRef "$\<lmtp_mime_header_checks\>" syntax match pfmainRef "$\<lmtp_mx_address_limit\>" syntax match pfmainRef "$\<lmtp_mx_session_limit\>" +syntax match pfmainRef "$\<lmtp_nested_header_checks\>" +syntax match pfmainRef "$\<lmtp_per_record_deadline\>" syntax match pfmainRef "$\<lmtp_pix_workaround_delay_time\>" +syntax match pfmainRef "$\<lmtp_pix_workaround_maps\>" syntax match pfmainRef "$\<lmtp_pix_workaround_threshold_time\>" +syntax match pfmainRef "$\<lmtp_pix_workarounds\>" syntax match pfmainRef "$\<lmtp_quit_timeout\>" syntax match pfmainRef "$\<lmtp_quote_rfc821_envelope\>" syntax match pfmainRef "$\<lmtp_randomize_addresses\>" syntax match pfmainRef "$\<lmtp_rcpt_timeout\>" +syntax match pfmainRef "$\<lmtp_reply_filter\>" syntax match pfmainRef "$\<lmtp_rset_timeout\>" +syntax match pfmainRef "$\<lmtp_sasl_auth_cache_name\>" +syntax match pfmainRef "$\<lmtp_sasl_auth_cache_time\>" syntax match pfmainRef "$\<lmtp_sasl_auth_enable\>" +syntax match pfmainRef "$\<lmtp_sasl_auth_soft_bounce\>" syntax match pfmainRef "$\<lmtp_sasl_mechanism_filter\>" syntax match pfmainRef "$\<lmtp_sasl_password_maps\>" syntax match pfmainRef "$\<lmtp_sasl_path\>" @@ -675,10 +959,31 @@ syntax match pfmainRef "$\<lmtp_sender_dependent_authentication\>" syntax match pfmainRef "$\<lmtp_skip_5xx_greeting\>" syntax match pfmainRef "$\<lmtp_starttls_timeout\>" syntax match pfmainRef "$\<lmtp_tcp_port\>" +syntax match pfmainRef "$\<lmtp_tls_CAfile\>" +syntax match pfmainRef "$\<lmtp_tls_CApath\>" +syntax match pfmainRef "$\<lmtp_tls_block_early_mail_reply\>" +syntax match pfmainRef "$\<lmtp_tls_cert_file\>" +syntax match pfmainRef "$\<lmtp_tls_ciphers\>" +syntax match pfmainRef "$\<lmtp_tls_dcert_file\>" +syntax match pfmainRef "$\<lmtp_tls_dkey_file\>" +syntax match pfmainRef "$\<lmtp_tls_eccert_file\>" +syntax match pfmainRef "$\<lmtp_tls_eckey_file\>" syntax match pfmainRef "$\<lmtp_tls_enforce_peername\>" +syntax match pfmainRef "$\<lmtp_tls_exclude_ciphers\>" +syntax match pfmainRef "$\<lmtp_tls_fingerprint_cert_match\>" +syntax match pfmainRef "$\<lmtp_tls_fingerprint_digest\>" +syntax match pfmainRef "$\<lmtp_tls_key_file\>" +syntax match pfmainRef "$\<lmtp_tls_loglevel\>" +syntax match pfmainRef "$\<lmtp_tls_mandatory_ciphers\>" +syntax match pfmainRef "$\<lmtp_tls_mandatory_exclude_ciphers\>" +syntax match pfmainRef "$\<lmtp_tls_mandatory_protocols\>" syntax match pfmainRef "$\<lmtp_tls_note_starttls_offer\>" syntax match pfmainRef "$\<lmtp_tls_per_site\>" +syntax match pfmainRef "$\<lmtp_tls_policy_maps\>" +syntax match pfmainRef "$\<lmtp_tls_protocols\>" syntax match pfmainRef "$\<lmtp_tls_scert_verifydepth\>" +syntax match pfmainRef "$\<lmtp_tls_session_cache_timeout\>" +syntax match pfmainRef "$\<lmtp_tls_verify_cert_match\>" syntax match pfmainRef "$\<lmtp_use_tls\>" syntax match pfmainRef "$\<lmtp_xforward_timeout\>" syntax match pfmainRef "$\<local_command_shell\>" @@ -703,6 +1008,7 @@ syntax match pfmainRef "$\<mailq_path\>" syntax match pfmainRef "$\<manpage_directory\>" syntax match pfmainRef "$\<maps_rbl_domains\>" syntax match pfmainRef "$\<maps_rbl_reject_code\>" +syntax match pfmainRef "$\<master_service_disable\>" syntax match pfmainRef "$\<masquerade_classes\>" syntax match pfmainRef "$\<masquerade_domains\>" syntax match pfmainRef "$\<masquerade_exceptions\>" @@ -713,10 +1019,31 @@ syntax match pfmainRef "$\<maximal_queue_lifetime\>" syntax match pfmainRef "$\<message_reject_characters\>" syntax match pfmainRef "$\<message_size_limit\>" syntax match pfmainRef "$\<message_strip_characters\>" +syntax match pfmainRef "$\<milter_command_timeout\>" +syntax match pfmainRef "$\<milter_connect_macros\>" +syntax match pfmainRef "$\<milter_connect_timeout\>" +syntax match pfmainRef "$\<milter_content_timeout\>" +syntax match pfmainRef "$\<milter_data_macros\>" +syntax match pfmainRef "$\<milter_default_action\>" +syntax match pfmainRef "$\<milter_end_of_data_macros\>" +syntax match pfmainRef "$\<milter_end_of_header_macros\>" +syntax match pfmainRef "$\<milter_header_checks\>" +syntax match pfmainRef "$\<milter_helo_macros\>" +syntax match pfmainRef "$\<milter_macro_daemon_name\>" +syntax match pfmainRef "$\<milter_macro_v\>" +syntax match pfmainRef "$\<milter_mail_macros\>" +syntax match pfmainRef "$\<milter_protocol\>" +syntax match pfmainRef "$\<milter_rcpt_macros\>" +syntax match pfmainRef "$\<milter_unknown_command_macros\>" syntax match pfmainRef "$\<mime_boundary_length_limit\>" syntax match pfmainRef "$\<mime_header_checks\>" syntax match pfmainRef "$\<mime_nesting_limit\>" syntax match pfmainRef "$\<minimal_backoff_time\>" +syntax match pfmainRef "$\<multi_instance_directories\>" +syntax match pfmainRef "$\<multi_instance_enable\>" +syntax match pfmainRef "$\<multi_instance_group\>" +syntax match pfmainRef "$\<multi_instance_name\>" +syntax match pfmainRef "$\<multi_instance_wrapper\>" syntax match pfmainRef "$\<multi_recipient_bounce_reject_code\>" syntax match pfmainRef "$\<mydestination\>" syntax match pfmainRef "$\<mydomain\>" @@ -727,23 +1054,77 @@ syntax match pfmainRef "$\<myorigin\>" syntax match pfmainRef "$\<nested_header_checks\>" syntax match pfmainRef "$\<newaliases_path\>" syntax match pfmainRef "$\<non_fqdn_reject_code\>" +syntax match pfmainRef "$\<non_smtpd_milters\>" syntax match pfmainRef "$\<notify_classes\>" syntax match pfmainRef "$\<owner_request_special\>" syntax match pfmainRef "$\<parent_domain_matches_subdomains\>" syntax match pfmainRef "$\<permit_mx_backup_networks\>" syntax match pfmainRef "$\<pickup_service_name\>" syntax match pfmainRef "$\<plaintext_reject_code\>" +syntax match pfmainRef "$\<postmulti_control_commands\>" +syntax match pfmainRef "$\<postmulti_start_commands\>" +syntax match pfmainRef "$\<postmulti_stop_commands\>" +syntax match pfmainRef "$\<postscreen_access_list\>" +syntax match pfmainRef "$\<postscreen_bare_newline_action\>" +syntax match pfmainRef "$\<postscreen_bare_newline_enable\>" +syntax match pfmainRef "$\<postscreen_bare_newline_ttl\>" +syntax match pfmainRef "$\<postscreen_blacklist_action\>" +syntax match pfmainRef "$\<postscreen_cache_cleanup_interval\>" +syntax match pfmainRef "$\<postscreen_cache_map\>" +syntax match pfmainRef "$\<postscreen_cache_retention_time\>" +syntax match pfmainRef "$\<postscreen_client_connection_count_limit\>" +syntax match pfmainRef "$\<postscreen_command_count_limit\>" +syntax match pfmainRef "$\<postscreen_command_filter\>" +syntax match pfmainRef "$\<postscreen_command_time_limit\>" +syntax match pfmainRef "$\<postscreen_disable_vrfy_command\>" +syntax match pfmainRef "$\<postscreen_discard_ehlo_keyword_address_maps\>" +syntax match pfmainRef "$\<postscreen_discard_ehlo_keywords\>" +syntax match pfmainRef "$\<postscreen_dnsbl_action\>" +syntax match pfmainRef "$\<postscreen_dnsbl_reply_map\>" +syntax match pfmainRef "$\<postscreen_dnsbl_sites\>" +syntax match pfmainRef "$\<postscreen_dnsbl_threshold\>" +syntax match pfmainRef "$\<postscreen_dnsbl_ttl\>" +syntax match pfmainRef "$\<postscreen_enforce_tls\>" +syntax match pfmainRef "$\<postscreen_expansion_filter\>" +syntax match pfmainRef "$\<postscreen_forbidden_commands\>" +syntax match pfmainRef "$\<postscreen_greet_action\>" +syntax match pfmainRef "$\<postscreen_greet_banner\>" +syntax match pfmainRef "$\<postscreen_greet_ttl\>" +syntax match pfmainRef "$\<postscreen_greet_wait\>" +syntax match pfmainRef "$\<postscreen_helo_required\>" +syntax match pfmainRef "$\<postscreen_non_smtp_command_action\>" +syntax match pfmainRef "$\<postscreen_non_smtp_command_enable\>" +syntax match pfmainRef "$\<postscreen_non_smtp_command_ttl\>" +syntax match pfmainRef "$\<postscreen_pipelining_action\>" +syntax match pfmainRef "$\<postscreen_pipelining_enable\>" +syntax match pfmainRef "$\<postscreen_pipelining_ttl\>" +syntax match pfmainRef "$\<postscreen_post_queue_limit\>" +syntax match pfmainRef "$\<postscreen_pre_queue_limit\>" +syntax match pfmainRef "$\<postscreen_reject_footer\>" +syntax match pfmainRef "$\<postscreen_tls_security_level\>" +syntax match pfmainRef "$\<lmtp_tls_secure_cert_match\>" +syntax match pfmainRef "$\<lmtp_tls_security_level\>" +syntax match pfmainRef "$\<lmtp_tls_session_cache_database\>" +syntax match pfmainRef "$\<postscreen_use_tls\>" +syntax match pfmainRef "$\<postscreen_watchdog_timeout\>" +syntax match pfmainRef "$\<postscreen_whitelist_interfaces\>" syntax match pfmainRef "$\<prepend_delivered_header\>" +syntax match pfmainRef "$\<process_id\>" syntax match pfmainRef "$\<process_id_directory\>" +syntax match pfmainRef "$\<process_name\>" syntax match pfmainRef "$\<propagate_unmatched_extensions\>" syntax match pfmainRef "$\<proxy_interfaces\>" syntax match pfmainRef "$\<proxy_read_maps\>" +syntax match pfmainRef "$\<proxy_write_maps\>" +syntax match pfmainRef "$\<proxymap_service_name\>" +syntax match pfmainRef "$\<proxywrite_service_name\>" syntax match pfmainRef "$\<qmgr_clog_warn_time\>" syntax match pfmainRef "$\<qmgr_fudge_factor\>" syntax match pfmainRef "$\<qmgr_message_active_limit\>" syntax match pfmainRef "$\<qmgr_message_recipient_limit\>" syntax match pfmainRef "$\<qmgr_message_recipient_minimum\>" syntax match pfmainRef "$\<qmqpd_authorized_clients\>" +syntax match pfmainRef "$\<qmqpd_client_port_logging\>" syntax match pfmainRef "$\<qmqpd_error_delay\>" syntax match pfmainRef "$\<qmqpd_timeout\>" syntax match pfmainRef "$\<queue_directory\>" @@ -759,6 +1140,7 @@ syntax match pfmainRef "$\<recipient_canonical_classes\>" syntax match pfmainRef "$\<recipient_canonical_maps\>" syntax match pfmainRef "$\<recipient_delimiter\>" syntax match pfmainRef "$\<reject_code\>" +syntax match pfmainRef "$\<reject_tempfail_action\>" syntax match pfmainRef "$\<relay_clientcerts\>" syntax match pfmainRef "$\<relay_destination_concurrency_limit\>" syntax match pfmainRef "$\<relay_destination_recipient_limit\>" @@ -770,23 +1152,28 @@ syntax match pfmainRef "$\<relayhost\>" syntax match pfmainRef "$\<relocated_maps\>" syntax match pfmainRef "$\<remote_header_rewrite_domain\>" syntax match pfmainRef "$\<require_home_directory\>" +syntax match pfmainRef "$\<reset_owner_alias\>" syntax match pfmainRef "$\<resolve_dequoted_address\>" syntax match pfmainRef "$\<resolve_null_domain\>" syntax match pfmainRef "$\<resolve_numeric_domain\>" syntax match pfmainRef "$\<rewrite_service_name\>" syntax match pfmainRef "$\<sample_directory\>" +syntax match pfmainRef "$\<send_cyrus_sasl_authzid\>" syntax match pfmainRef "$\<sender_bcc_maps\>" syntax match pfmainRef "$\<sender_canonical_classes\>" syntax match pfmainRef "$\<sender_canonical_maps\>" +syntax match pfmainRef "$\<sender_dependent_default_transport_maps\>" syntax match pfmainRef "$\<sender_dependent_relayhost_maps\>" syntax match pfmainRef "$\<sendmail_path\>" syntax match pfmainRef "$\<service_throttle_time\>" syntax match pfmainRef "$\<setgid_group\>" syntax match pfmainRef "$\<show_user_unknown_table_name\>" syntax match pfmainRef "$\<showq_service_name\>" +syntax match pfmainRef "$\<smtp_address_preference\>" syntax match pfmainRef "$\<smtp_always_send_ehlo\>" syntax match pfmainRef "$\<smtp_bind_address\>" syntax match pfmainRef "$\<smtp_bind_address6\>" +syntax match pfmainRef "$\<smtp_body_checks\>" syntax match pfmainRef "$\<smtp_cname_overrides_servername\>" syntax match pfmainRef "$\<smtp_connect_timeout\>" syntax match pfmainRef "$\<smtp_connection_cache_destinations\>" @@ -801,25 +1188,35 @@ syntax match pfmainRef "$\<smtp_destination_concurrency_limit\>" syntax match pfmainRef "$\<smtp_destination_recipient_limit\>" syntax match pfmainRef "$\<smtp_discard_ehlo_keyword_address_maps\>" syntax match pfmainRef "$\<smtp_discard_ehlo_keywords\>" +syntax match pfmainRef "$\<smtp_dns_resolver_options\>" syntax match pfmainRef "$\<smtp_enforce_tls\>" syntax match pfmainRef "$\<smtp_fallback_relay\>" syntax match pfmainRef "$\<smtp_generic_maps\>" +syntax match pfmainRef "$\<smtp_header_checks\>" syntax match pfmainRef "$\<smtp_helo_name\>" syntax match pfmainRef "$\<smtp_helo_timeout\>" syntax match pfmainRef "$\<smtp_host_lookup\>" syntax match pfmainRef "$\<smtp_line_length_limit\>" syntax match pfmainRef "$\<smtp_mail_timeout\>" +syntax match pfmainRef "$\<smtp_mime_header_checks\>" syntax match pfmainRef "$\<smtp_mx_address_limit\>" syntax match pfmainRef "$\<smtp_mx_session_limit\>" +syntax match pfmainRef "$\<smtp_nested_header_checks\>" syntax match pfmainRef "$\<smtp_never_send_ehlo\>" syntax match pfmainRef "$\<smtp_pix_workaround_delay_time\>" +syntax match pfmainRef "$\<smtp_pix_workaround_maps\>" syntax match pfmainRef "$\<smtp_pix_workaround_threshold_time\>" +syntax match pfmainRef "$\<smtp_pix_workarounds\>" syntax match pfmainRef "$\<smtp_quit_timeout\>" syntax match pfmainRef "$\<smtp_quote_rfc821_envelope\>" syntax match pfmainRef "$\<smtp_randomize_addresses\>" syntax match pfmainRef "$\<smtp_rcpt_timeout\>" +syntax match pfmainRef "$\<smtp_reply_filter\>" syntax match pfmainRef "$\<smtp_rset_timeout\>" +syntax match pfmainRef "$\<smtp_sasl_auth_cache_name\>" +syntax match pfmainRef "$\<smtp_sasl_auth_cache_time\>" syntax match pfmainRef "$\<smtp_sasl_auth_enable\>" +syntax match pfmainRef "$\<smtp_sasl_auth_soft_bounce\>" syntax match pfmainRef "$\<smtp_sasl_mechanism_filter\>" syntax match pfmainRef "$\<smtp_sasl_password_maps\>" syntax match pfmainRef "$\<smtp_sasl_path\>" @@ -834,18 +1231,33 @@ syntax match pfmainRef "$\<smtp_skip_quit_response\>" syntax match pfmainRef "$\<smtp_starttls_timeout\>" syntax match pfmainRef "$\<smtp_tls_CAfile\>" syntax match pfmainRef "$\<smtp_tls_CApath\>" +syntax match pfmainRef "$\<smtp_tls_block_early_mail_reply\>" syntax match pfmainRef "$\<smtp_tls_cert_file\>" syntax match pfmainRef "$\<smtp_tls_cipherlist\>" +syntax match pfmainRef "$\<smtp_tls_ciphers\>" syntax match pfmainRef "$\<smtp_tls_dcert_file\>" syntax match pfmainRef "$\<smtp_tls_dkey_file\>" +syntax match pfmainRef "$\<smtp_tls_eccert_file\>" +syntax match pfmainRef "$\<smtp_tls_eckey_file\>" syntax match pfmainRef "$\<smtp_tls_enforce_peername\>" +syntax match pfmainRef "$\<smtp_tls_exclude_ciphers\>" +syntax match pfmainRef "$\<smtp_tls_fingerprint_cert_match\>" +syntax match pfmainRef "$\<smtp_tls_fingerprint_digest\>" syntax match pfmainRef "$\<smtp_tls_key_file\>" syntax match pfmainRef "$\<smtp_tls_loglevel\>" +syntax match pfmainRef "$\<smtp_tls_mandatory_ciphers\>" +syntax match pfmainRef "$\<smtp_tls_mandatory_exclude_ciphers\>" +syntax match pfmainRef "$\<smtp_tls_mandatory_protocols\>" syntax match pfmainRef "$\<smtp_tls_note_starttls_offer\>" syntax match pfmainRef "$\<smtp_tls_per_site\>" +syntax match pfmainRef "$\<smtp_tls_policy_maps\>" +syntax match pfmainRef "$\<smtp_tls_protocols\>" syntax match pfmainRef "$\<smtp_tls_scert_verifydepth\>" +syntax match pfmainRef "$\<smtp_tls_secure_cert_match\>" +syntax match pfmainRef "$\<smtp_tls_security_level\>" syntax match pfmainRef "$\<smtp_tls_session_cache_database\>" syntax match pfmainRef "$\<smtp_tls_session_cache_timeout\>" +syntax match pfmainRef "$\<smtp_tls_verify_cert_match\>" syntax match pfmainRef "$\<smtp_use_tls\>" syntax match pfmainRef "$\<smtp_xforward_timeout\>" syntax match pfmainRef "$\<smtpd_authorized_verp_clients\>" @@ -857,8 +1269,10 @@ syntax match pfmainRef "$\<smtpd_client_connection_rate_limit\>" syntax match pfmainRef "$\<smtpd_client_event_limit_exceptions\>" syntax match pfmainRef "$\<smtpd_client_message_rate_limit\>" syntax match pfmainRef "$\<smtpd_client_new_tls_session_rate_limit\>" +syntax match pfmainRef "$\<smtpd_client_port_logging\>" syntax match pfmainRef "$\<smtpd_client_recipient_rate_limit\>" syntax match pfmainRef "$\<smtpd_client_restrictions\>" +syntax match pfmainRef "$\<smtpd_command_filter\>" syntax match pfmainRef "$\<smtpd_data_restrictions\>" syntax match pfmainRef "$\<smtpd_delay_open_until_valid_rcpt\>" syntax match pfmainRef "$\<smtpd_delay_reject\>" @@ -875,18 +1289,22 @@ syntax match pfmainRef "$\<smtpd_helo_required\>" syntax match pfmainRef "$\<smtpd_helo_restrictions\>" syntax match pfmainRef "$\<smtpd_history_flush_threshold\>" syntax match pfmainRef "$\<smtpd_junk_command_limit\>" +syntax match pfmainRef "$\<smtpd_milters\>" syntax match pfmainRef "$\<smtpd_noop_commands\>" syntax match pfmainRef "$\<smtpd_null_access_lookup_key\>" syntax match pfmainRef "$\<smtpd_peername_lookup\>" +syntax match pfmainRef "$\<smtpd_per_record_deadline\>" syntax match pfmainRef "$\<smtpd_policy_service_max_idle\>" syntax match pfmainRef "$\<smtpd_policy_service_max_ttl\>" syntax match pfmainRef "$\<smtpd_policy_service_timeout\>" syntax match pfmainRef "$\<smtpd_proxy_ehlo\>" syntax match pfmainRef "$\<smtpd_proxy_filter\>" +syntax match pfmainRef "$\<smtpd_proxy_options\>" syntax match pfmainRef "$\<smtpd_proxy_timeout\>" syntax match pfmainRef "$\<smtpd_recipient_limit\>" syntax match pfmainRef "$\<smtpd_recipient_overshoot_limit\>" syntax match pfmainRef "$\<smtpd_recipient_restrictions\>" +syntax match pfmainRef "$\<smtpd_reject_footer\>" syntax match pfmainRef "$\<smtpd_reject_unlisted_recipient\>" syntax match pfmainRef "$\<smtpd_reject_unlisted_sender\>" syntax match pfmainRef "$\<smtpd_restriction_classes\>" @@ -900,59 +1318,142 @@ syntax match pfmainRef "$\<smtpd_sasl_tls_security_options\>" syntax match pfmainRef "$\<smtpd_sasl_type\>" syntax match pfmainRef "$\<smtpd_sender_login_maps\>" syntax match pfmainRef "$\<smtpd_sender_restrictions\>" +syntax match pfmainRef "$\<smtpd_service_name\>" syntax match pfmainRef "$\<smtpd_soft_error_limit\>" syntax match pfmainRef "$\<smtpd_starttls_timeout\>" syntax match pfmainRef "$\<smtpd_timeout\>" syntax match pfmainRef "$\<smtpd_tls_CAfile\>" syntax match pfmainRef "$\<smtpd_tls_CApath\>" +syntax match pfmainRef "$\<smtpd_tls_always_issue_session_ids\>" syntax match pfmainRef "$\<smtpd_tls_ask_ccert\>" syntax match pfmainRef "$\<smtpd_tls_auth_only\>" syntax match pfmainRef "$\<smtpd_tls_ccert_verifydepth\>" syntax match pfmainRef "$\<smtpd_tls_cert_file\>" syntax match pfmainRef "$\<smtpd_tls_cipherlist\>" +syntax match pfmainRef "$\<smtpd_tls_ciphers\>" syntax match pfmainRef "$\<smtpd_tls_dcert_file\>" syntax match pfmainRef "$\<smtpd_tls_dh1024_param_file\>" syntax match pfmainRef "$\<smtpd_tls_dh512_param_file\>" syntax match pfmainRef "$\<smtpd_tls_dkey_file\>" +syntax match pfmainRef "$\<smtpd_tls_eccert_file\>" +syntax match pfmainRef "$\<smtpd_tls_eckey_file\>" +syntax match pfmainRef "$\<smtpd_tls_eecdh_grade\>" +syntax match pfmainRef "$\<smtpd_tls_exclude_ciphers\>" +syntax match pfmainRef "$\<smtpd_tls_fingerprint_digest\>" syntax match pfmainRef "$\<smtpd_tls_key_file\>" syntax match pfmainRef "$\<smtpd_tls_loglevel\>" +syntax match pfmainRef "$\<smtpd_tls_mandatory_ciphers\>" +syntax match pfmainRef "$\<smtpd_tls_mandatory_exclude_ciphers\>" +syntax match pfmainRef "$\<smtpd_tls_mandatory_protocols\>" +syntax match pfmainRef "$\<smtpd_tls_protocols\>" syntax match pfmainRef "$\<smtpd_tls_received_header\>" syntax match pfmainRef "$\<smtpd_tls_req_ccert\>" +syntax match pfmainRef "$\<smtpd_tls_security_level\>" syntax match pfmainRef "$\<smtpd_tls_session_cache_database\>" syntax match pfmainRef "$\<smtpd_tls_session_cache_timeout\>" syntax match pfmainRef "$\<smtpd_tls_wrappermode\>" syntax match pfmainRef "$\<smtpd_use_tls\>" syntax match pfmainRef "$\<soft_bounce\>" syntax match pfmainRef "$\<stale_lock_time\>" +syntax match pfmainRef "$\<stress\>" syntax match pfmainRef "$\<strict_7bit_headers\>" syntax match pfmainRef "$\<strict_8bitmime\>" syntax match pfmainRef "$\<strict_8bitmime_body\>" syntax match pfmainRef "$\<strict_mime_encoding_domain\>" syntax match pfmainRef "$\<strict_rfc821_envelopes\>" +syntax match pfmainRef "$\<strict_7bit_headers\>" +syntax match pfmainRef "$\<strict_8bitmime\>" +syntax match pfmainRef "$\<strict_8bitmime_body\>" +syntax match pfmainRef "$\<strict_mailbox_ownership\>" +syntax match pfmainRef "$\<strict_mime_encoding_domain\>" +syntax match pfmainRef "$\<strict_rfc821_envelopes\>" syntax match pfmainRef "$\<sun_mailtool_compatibility\>" syntax match pfmainRef "$\<swap_bangpath\>" syntax match pfmainRef "$\<syslog_facility\>" syntax match pfmainRef "$\<syslog_name\>" +syntax match pfmainRef "$\<tcp_windowsize\>" +syntax match pfmainRef "$\<tls_append_default_CA\>" syntax match pfmainRef "$\<tls_daemon_random_bytes\>" +syntax match pfmainRef "$\<tls_disable_workarounds\>" +syntax match pfmainRef "$\<tls_eecdh_strong_curve\>" +syntax match pfmainRef "$\<tls_eecdh_ultra_curve\>" +syntax match pfmainRef "$\<tls_export_cipherlist\>" +syntax match pfmainRef "$\<tls_high_cipherlist\>" +syntax match pfmainRef "$\<tls_low_cipherlist\>" +syntax match pfmainRef "$\<tls_medium_cipherlist\>" +syntax match pfmainRef "$\<tls_null_cipherlist\>" +syntax match pfmainRef "$\<tls_preempt_cipherlist\>" syntax match pfmainRef "$\<tls_random_bytes\>" syntax match pfmainRef "$\<tls_random_exchange_name\>" syntax match pfmainRef "$\<tls_random_prng_update_period\>" syntax match pfmainRef "$\<tls_random_reseed_period\>" syntax match pfmainRef "$\<tls_random_source\>" +syntax match pfmainRef "$\<tlsproxy_enforce_tls\>" +syntax match pfmainRef "$\<tlsproxy_service_name\>" +syntax match pfmainRef "$\<tlsproxy_tls_CAfile\>" +syntax match pfmainRef "$\<tlsproxy_tls_CApath\>" +syntax match pfmainRef "$\<tlsproxy_tls_always_issue_session_ids\>" +syntax match pfmainRef "$\<tlsproxy_tls_ask_ccert\>" +syntax match pfmainRef "$\<tlsproxy_tls_ccert_verifydepth\>" +syntax match pfmainRef "$\<tlsproxy_tls_cert_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_ciphers\>" +syntax match pfmainRef "$\<tlsproxy_tls_dcert_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_dh1024_param_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_dh512_param_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_dkey_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_eccert_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_eckey_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_eecdh_grade\>" +syntax match pfmainRef "$\<tlsproxy_tls_exclude_ciphers\>" +syntax match pfmainRef "$\<tlsproxy_tls_fingerprint_digest\>" +syntax match pfmainRef "$\<tlsproxy_tls_key_file\>" +syntax match pfmainRef "$\<tlsproxy_tls_loglevel\>" +syntax match pfmainRef "$\<tlsproxy_tls_mandatory_ciphers\>" +syntax match pfmainRef "$\<tlsproxy_tls_mandatory_exclude_ciphers\>" +syntax match pfmainRef "$\<tlsproxy_tls_mandatory_protocols\>" +syntax match pfmainRef "$\<tlsproxy_tls_protocols\>" +syntax match pfmainRef "$\<tlsproxy_tls_req_ccert\>" +syntax match pfmainRef "$\<tlsproxy_tls_security_level\>" +syntax match pfmainRef "$\<tlsproxy_tls_session_cache_timeout\>" +syntax match pfmainRef "$\<tlsproxy_use_tls\>" +syntax match pfmainRef "$\<tlsproxy_watchdog_timeout\>" syntax match pfmainRef "$\<trace_service_name\>" +syntax match pfmainRef "$\<transport_delivery_slot_cost\>" +syntax match pfmainRef "$\<transport_delivery_slot_discount\>" +syntax match pfmainRef "$\<transport_delivery_slot_loan\>" +syntax match pfmainRef "$\<transport_destination_concurrency_failed_cohort_limit\>" +syntax match pfmainRef "$\<transport_destination_concurrency_limit\>" +syntax match pfmainRef "$\<transport_destination_concurrency_negative_feedback\>" +syntax match pfmainRef "$\<transport_destination_concurrency_positive_feedback\>" +syntax match pfmainRef "$\<transport_destination_rate_delay\>" +syntax match pfmainRef "$\<transport_destination_recipient_limit\>" +syntax match pfmainRef "$\<transport_extra_recipient_limit\>" +syntax match pfmainRef "$\<transport_initial_destination_concurrency\>" syntax match pfmainRef "$\<transport_maps\>" +syntax match pfmainRef "$\<transport_minimum_delivery_slots\>" +syntax match pfmainRef "$\<transport_recipient_limit\>" +syntax match pfmainRef "$\<transport_recipient_refill_delay\>" +syntax match pfmainRef "$\<transport_recipient_refill_limit\>" syntax match pfmainRef "$\<transport_retry_time\>" syntax match pfmainRef "$\<trigger_timeout\>" syntax match pfmainRef "$\<undisclosed_recipients_header\>" syntax match pfmainRef "$\<unknown_address_reject_code\>" +syntax match pfmainRef "$\<unknown_address_tempfail_action\>" syntax match pfmainRef "$\<unknown_client_reject_code\>" +syntax match pfmainRef "$\<unknown_helo_hostname_tempfail_action\>" syntax match pfmainRef "$\<unknown_hostname_reject_code\>" syntax match pfmainRef "$\<unknown_local_recipient_reject_code\>" syntax match pfmainRef "$\<unknown_relay_recipient_reject_code\>" syntax match pfmainRef "$\<unknown_virtual_alias_reject_code\>" syntax match pfmainRef "$\<unknown_virtual_mailbox_reject_code\>" +syntax match pfmainRef "$\<unverified_recipient_defer_code\>" syntax match pfmainRef "$\<unverified_recipient_reject_code\>" +syntax match pfmainRef "$\<unverified_recipient_reject_reason\>" +syntax match pfmainRef "$\<unverified_recipient_tempfail_action\>" +syntax match pfmainRef "$\<unverified_sender_defer_code\>" syntax match pfmainRef "$\<unverified_sender_reject_code\>" +syntax match pfmainRef "$\<unverified_sender_reject_reason\>" +syntax match pfmainRef "$\<unverified_sender_tempfail_action\>" syntax match pfmainRef "$\<verp_delimiter_filter\>" syntax match pfmainRef "$\<virtual_alias_domains\>" syntax match pfmainRef "$\<virtual_alias_expansion_limit\>" @@ -969,6 +1470,7 @@ syntax match pfmainRef "$\<virtual_mailbox_maps\>" syntax match pfmainRef "$\<virtual_minimum_uid\>" syntax match pfmainRef "$\<virtual_transport\>" syntax match pfmainRef "$\<virtual_uid_maps\>" + syntax keyword pfmainWord all syntax keyword pfmainWord check_address_map syntax keyword pfmainWord check_ccert_access @@ -987,17 +1489,29 @@ syntax keyword pfmainWord check_sender_access syntax keyword pfmainWord check_sender_mx_access syntax keyword pfmainWord check_sender_ns_access syntax keyword pfmainWord class +syntax keyword pfmainWord client_address +syntax keyword pfmainWord client_port syntax keyword pfmainWord defer_if_permit syntax keyword pfmainWord defer_if_reject syntax keyword pfmainWord dns +syntax keyword pfmainWord drop +syntax keyword pfmainWord dunno +syntax keyword pfmainWord enforce syntax keyword pfmainWord envelope_recipient syntax keyword pfmainWord envelope_sender +syntax keyword pfmainWord export syntax keyword pfmainWord header_recipient syntax keyword pfmainWord header_sender +syntax keyword pfmainWord high syntax keyword pfmainWord host +syntax keyword pfmainWord ignore syntax keyword pfmainWord ipv4 syntax keyword pfmainWord ipv6 +syntax keyword pfmainWord localtime +syntax keyword pfmainWord low +syntax keyword pfmainWord medium syntax keyword pfmainWord native +syntax keyword pfmainWord null syntax keyword pfmainWord permit syntax keyword pfmainWord permit_auth_destination syntax keyword pfmainWord permit_inet_interfaces @@ -1008,6 +1522,7 @@ syntax keyword pfmainWord permit_sasl_authenticated syntax keyword pfmainWord permit_tls_all_clientcerts syntax keyword pfmainWord permit_tls_clientcerts syntax keyword pfmainWord reject +syntax keyword pfmainWord reject_authenticated_sender_login_mismatch syntax keyword pfmainWord reject_invalid_helo_hostname syntax keyword pfmainWord reject_invalid_hostname syntax keyword pfmainWord reject_maps_rbl @@ -1041,8 +1556,23 @@ syntax keyword pfmainWord reject_unverified_recipient syntax keyword pfmainWord reject_unverified_sender syntax keyword pfmainWord sleep syntax keyword pfmainWord smtpd_access_maps +syntax keyword pfmainWord server_name +syntax keyword pfmainWord speed_adjust syntax keyword pfmainWord subnet syntax keyword pfmainWord warn_if_reject +syntax keyword pfmainWord CRYPTOPRO_TLSEXT_BUG +syntax keyword pfmainWord DONT_INSERT_EMPTY_FRAGMENTS +syntax keyword pfmainWord LEGACY_SERVER_CONNECT +syntax keyword pfmainWord MICROSOFT_BIG_SSLV3_BUFFER +syntax keyword pfmainWord MICROSOFT_SESS_ID_BUG +syntax keyword pfmainWord MSIE_SSLV2_RSA_PADDING +syntax keyword pfmainWord NETSCAPE_CHALLENGE_BUG +syntax keyword pfmainWord NETSCAPE_REUSE_CIPHER_CHANGE_BUG +syntax keyword pfmainWord SSLEAY_080_CLIENT_DH_BUG +syntax keyword pfmainWord SSLREF2_REUSE_CERT_TYPE_BUG +syntax keyword pfmainWord TLS_BLOCK_PADDING_BUG +syntax keyword pfmainWord TLS_D5_BUG +syntax keyword pfmainWord TLS_ROLLBACK_BUG syntax keyword pfmainDict btree cidr environ hash nis pcre proxy regexp sdbm sdbm static tcp unix syntax keyword pfmainQueueDir incoming active deferred corrupt hold |