X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.muttrc.addons;h=be5d45e3c7b21b8f2a82b7bfa86d8625f1387072;hp=5c82bcb53ed5042dda3e04863d4aad5f055d9aa7;hb=e0f54b4c0e257360604f16e326abd3b1779a3670;hpb=71d174aabc2213332ef34b03e582a689f8d9c434

diff --git a/.muttrc.addons b/.muttrc.addons
index 5c82bcb..be5d45e 100644
--- a/.muttrc.addons
+++ b/.muttrc.addons
@@ -4,10 +4,10 @@
 # '!' an '=' are expand only as the very first characters.
 # regexes are processed.
 # '$' must follow alpha or '{' to get interpreted as a variable.
-folder-hook ""                   set sort=threads
-folder-hook "!$"                 set sort=mailbox-order;push "*<Tab>"
-folder-hook "=(=|err|rhbug)"     set sort=mailbox-order;push "*<Tab>"
-folder-hook "=(sent|spam|input)" set sort=mailbox-order;push "*"
+folder-hook ""                   set sort=threads;set pager_index_lines=10
+folder-hook "!$"                 set sort=mailbox-order;push "*<Tab>";set pager_index_lines=0
+folder-hook "=(=|err|rhbug)"     set sort=mailbox-order;push "*<Tab>";set pager_index_lines=0
+folder-hook "=(sent|spam|input)" set sort=mailbox-order;push "*";set pager_index_lines=0
 bind index <Tab> next-new
 bind pager <Tab> next-new
 bind index <Esc><Tab> previous-new
@@ -56,21 +56,24 @@ unset markers
 # Mailman; FIXME: Patch Mutt to extend it multiline.
 color body brightred default "^_______________________________________________\r?\n$"
 macro index <Esc>m "l~N|~O\n"
+macro pager <Esc>f ":set pager_index_lines=0\n
+macro pager <Esc>g ":set pager_index_lines=10\n"
 
 
 # Mail command
 ##############
 bind index \ca mail
-macro index M ":my_hdr X-Priority: 1\n:my_hdr Importance: high\n:set dsn_return=hdrs\n:set dsn_notify=failure,delay,success\n^a" "DSN and Priority-1 classed compose of a new mail message"
-macro index m ":unmy_hdr X-Priority Importance\n:unset dsn_return dsn_notify\n^a" "Standard compose of a new mail message"
+macro index M ":set dsn_return=hdrs\n:set dsn_notify=failure,delay,success\n^a" "DSN compose of a new mail message"
+macro index m ":unset dsn_return dsn_notify\n^a" "Standard compose of a new mail message"
 # quote 'macro' argument to prevent: macro: too many arguments
 # `spamassassin {--report|--revoke}' calls `sa-learn {--spam|--ham}' automatically.
-folder-hook ""      "macro index S \":unset wait_key\n|spamassassin --report\n:set wait_key\ns=spamo-mutt\n\""
-folder-hook "=spam" "macro index S \":unset wait_key\n|spamassassin --report\n:set wait_key\nWN\ct~T\n\""
-folder-hook ""      "macro pager S \":unset wait_key\n|spamassassin --report\n:set wait_key\ns=spamo-mutt\n\""
-folder-hook "=spam" "macro pager S \":unset wait_key\n|spamassassin --report\n:set wait_key\n\""
-folder-hook ""      "macro index H \":unset wait_key\n|spamassassin --revoke\n:set wait_key\nWN\ct~T\n\""
-folder-hook ""      "macro pager H \":unset wait_key\n|spamassassin --revoke\n:set wait_key\n\""
+set pipe_split
+folder-hook ""      "macro index S \":unset wait_key\n|spamassassin --report&\n:set wait_key\ns=spamo-mutt\n\""
+folder-hook "=spam" "macro index S \":unset wait_key\n|spamassassin --report&\n:set wait_key\nWN\ct~T\n\""
+folder-hook ""      "macro pager S \":unset wait_key\n|spamassassin --report&\n:set wait_key\ns=spamo-mutt\n\""
+folder-hook "=spam" "macro pager S \":unset wait_key\n|spamassassin --report&\n:set wait_key\n\""
+folder-hook ""      "macro index H \":unset wait_key\n|spamassassin --revoke \n:set wait_key\nWN\ct~T\n\""
+folder-hook ""      "macro pager H \":unset wait_key\n|spamassassin --revoke \n:set wait_key\n\""
 macro editor \ew "^a  [^e]^a"
 
 # GPG
@@ -91,8 +94,18 @@ ignore x-loop: errors-to: x-beenthere: X-Mailman-Version: X-Sieve:
 ignore x-mimetrack: priority: x-priority: importance: precedence: x-mime-autoconverted:
 ignore x-accept-language: x-sender: x-antirelay:
 ignore x-msmail-priority: x-mimeole: x-pop3-rcpt: delivered-to:
-ignore face: organization:
+ignore face: organization: x-scanned-by: x-bugzilla-
 ignore DKIM-Signature: DomainKey-Signature: X-RedHat-Spam-Score:
+ignore Authentication-Results: X-Virus-Found: X-Spam-SWARE-Status: X-HELO:
+ignore X-Google-DKIM-Signature: X-Gm-Message-State: X-Received: X-IsSubscribed:
+ignore ARC-Seal: ARC-Message-Signature: ARC-Authentication-Results: Received-SPF: DMARC-Filter: DKIM-Filter: Auto-Submitted: X-Greylist:
+ignore X-Spam-Status X-Spam-Checker-Version X-AuditID X-MTR Msgkey X-EPLocale X-EPWebmail-Msg-Type X-EPWebmail-Reply-Demand
+ignore X-EPApproval-Locale X-EPHeader X-EPTrCode X-EPTrName X-MLAttribute X-RootMTR X-ParentMTR X-ArchiveUser X-CPGSPASS
+ignore X-Brightmail-Tracker X-ClientProxiedBy X-MS-PublicTrafficType X-MS-Office365-Filtering-Correlation-Id X-Microsoft-Antispam
+ignore X-Microsoft-Exchange-Diagnostics X-MS-TrafficTypeDiagnostic X-Microsoft-Antispam-PRVS
+ignore X-Exchange-Antispam-Report-Test X-Exchange-Antispam-Report-CFA-Test SpamDiagnosticOutput SpamDiagnosticMetadata
+ignore X-Forefront-PRVS X-Forefront-Antispam-Report X-MS-Exchange-CrossTenant-OriginalArrivalTime
+ignore X-MS-Exchange-CrossTenant-FromEntityHeader X-MS-Exchange-Transport-CrossTenantHeadersStamped X-OriginatorOrg
 color header brightyellow black ^(From|Subject|To|Cc|Bcc|Message-ID):
 
 # Colors