From: Floyd Anderson Date: Sun, 8 Apr 2018 21:42:01 +0000 (+0200) Subject: doc/manual.xml.head: Adapt definitions of commands X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7967448189674ed3608743cb523f946cab6c04ba;p=neomutt doc/manual.xml.head: Adapt definitions of commands --- diff --git a/doc/manual.xml.head b/doc/manual.xml.head index 22a6debea..eccf9c622 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -3695,7 +3695,7 @@ alternates -group me -group work address3 address - address + , address unalias @@ -3799,6 +3799,9 @@ set alias_file=~/.mail_aliases map + + ,map + key @@ -4241,6 +4244,9 @@ folder-hook work "set sort=threads" menu + + ,menu + key @@ -4777,7 +4783,7 @@ export COLORFGBG mono - + attribute @@ -6030,6 +6036,12 @@ set spam_separator=", " + + + + + + variable @@ -6295,8 +6307,8 @@ mailboxes $my_mx +mailbox3 source - - file + + filename @@ -9791,10 +9803,10 @@ application/ms-excel; open.pl %s auto_view - mimetype + mime-type/mime-subtype - mimetype + mime-type/mime-subtype unauto_view @@ -9802,7 +9814,7 @@ application/ms-excel; open.pl %s * - mimetype + mime-type/mime-subtype @@ -9930,16 +9942,28 @@ alternative_order text/enriched text/plain text \ attachments - - { + | - }disposition - + + + + + + + - + + + disposition mime-type unattachments - - { + | - }disposition - + + + + + + + - + + + disposition mime-type @@ -10048,10 +10072,10 @@ attachments -I message/external-body mime_lookup - mimetype + mime-type/mime-subtype - mimetype + mime-type/mime-subtype unmime_lookup @@ -10059,7 +10083,7 @@ attachments -I message/external-body * - mimetype + mime-type/mime-subtype @@ -10893,24 +10917,24 @@ bind index,pager @ compose-to-sender open-hook - pattern + regex - shell-command + "shell-command" close-hook - pattern + regex - shell-command + "shell-command" append-hook - pattern + regex - shell-command + "shell-command" @@ -11000,7 +11024,7 @@ bind index,pager @ compose-to-sender Read from compressed mailbox - open-hook regex shell-command + open-hook regex "shell-command" If NeoMutt is unable to open a file, it then looks for open-hook that matches the filename. @@ -11043,7 +11067,7 @@ open-hook '\.gz$' "gzip --stdout --decompress '%f' > '%t'" Write to a compressed mailbox - close-hook regex shell-command + close-hook regex "shell-command" When NeoMutt has finished with a compressed mail folder, it will look for a matching close-hook to recompress the @@ -11098,7 +11122,7 @@ open-hook '\.gz$' "gzip --stdout --decompress '%f' > '%t'" Append to a compressed mailbox - append-hook regex shell-command + append-hook regex "shell-command" When NeoMutt wants to append an email to a compressed mail folder, it will look for a matching append-hook. This @@ -12176,19 +12200,19 @@ set abort_noattach_regex = "\\<attach(|ed|ments?)\\>" timeout-hook - NEOMUTT-COMMAND + command startup-hook - NEOMUTT-COMMAND + command shutdown-hook - NEOMUTT-COMMAND + command @@ -12280,9 +12304,9 @@ shutdown-hook 'exec sync-mailbox' -ifdef symbol config-command [args...] # If a symbol is defined -ifndef symbol config-command [args...] # If a symbol is not defined -finish # Finish reading the current file +ifdef symbol "config-command [args...]" # If a symbol is defined +ifndef symbol "config-command [args...]" # If a symbol is not defined +finish # Finish reading the current file @@ -12316,16 +12340,16 @@ ifndef sidebar finish symbol - "config-command - [args]" + "config-command + args" ifndef symbol - "config-command - [args]" + "config-command + args" finish @@ -12341,8 +12365,8 @@ ifndef sidebar finish # one config file between versions of NeoMutt that may have different # features compiled in. -# ifdef symbol config-command [args...] -# ifndef symbol config-command [args...] +# ifdef symbol "config-command [args...]" +# ifndef symbol "config-command [args...]" # finish # The 'ifdef' command tests whether NeoMutt understands the name of # a variable, function, command or compile-time symbol. @@ -16850,7 +16874,7 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org address - address + , address unalias @@ -16907,10 +16931,10 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org alternative_order - mimetype + mime-type/mime-subtype - mimetype + mime-type/mime-subtype unalternative_order @@ -16920,7 +16944,7 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org * - mimetype + mime-type/mime-subtype @@ -16931,10 +16955,10 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org append-hook - pattern + regex - shell-command + "shell-command" @@ -16943,18 +16967,30 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org attachments - - { + | - }disposition - + + + + + + + - + + + disposition mime-type unattachments - - { + | - }disposition - + + + + + + + - + + + disposition mime-type @@ -16966,10 +17002,10 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org auto_view - mimetype + mime-type/mime-subtype - mimetype + mime-type/mime-subtype unauto_view @@ -16979,7 +17015,7 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org * - mimetype + mime-type/mime-subtype @@ -16992,6 +17028,9 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org map + + ,map + key @@ -17019,10 +17058,10 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org close-hook - pattern + regex - shell-command + "shell-command" @@ -17248,12 +17287,25 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org ifdef - item + symbol - "config-command - [args]" + "config-command + args" + + ifndef + + + symbol + + + "config-command + args" + + + finish + @@ -17320,6 +17372,9 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org menu + + ,menu + key @@ -17413,10 +17468,10 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org mime_lookup - mimetype + mime-type/mime-subtype - mimetype + mime-type/mime-subtype unmime_lookup @@ -17426,7 +17481,7 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org * - mimetype + mime-type/mime-subtype @@ -17463,7 +17518,7 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org mono - + attribute @@ -17476,7 +17531,7 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org - + @@ -17522,10 +17577,10 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org open-hook - pattern + regex - shell-command + "shell-command" @@ -17629,6 +17684,12 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org + + + + + + variable @@ -17671,12 +17732,14 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org setenv - - [?]variable - - - value - + + + ?variable + + + variable value + + unsetenv @@ -17814,6 +17877,28 @@ neomutt mailto:some@one.org?subject=test&cc=other@one.org + + + + shutdown-hook + + + command + + + startup-hook + + + command + + + timeout-hook + + + command + + +