source muttrc; git rid of useless headers and macros

diff --git a/.muttrc b/.muttrc
index c2f4d7648657106be393ad3887bca13c67d6e13b..3cbce4afed4d67df547f5bcd632a00954be5033f 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -267,24 +267,18 @@ bind index   V     show-version
 bind pager   V     show-version
 bind index   A     create-alias
 bind pager   A     create-alias
-#macro index  S     <pipe-message>add_spammer.pl<enter>s="SPAM\n"
-#macro pager  S     <pipe-message>add_spammer.pl<enter>s="SPAM\n"
-#macro index  X     |"spamassassin -r \n"
-#macro pager  X     |"spamassassin -r \n"
 macro index  S     "s=spam/MANUALSPAM\r"
 macro pager  S     "s=spam/MANUALSPAM\r"
 macro index  X     "<copy-message>=spam/HAM\r"
 macro pager  X     "<copy-message>=spam/HAM\r"
-macro index  "\\T"   "<copy-message>=TODO\r"
-macro pager  "\\T"   "<copy-message>=TODO\r"
 
 ## ==============================================
 ## Bindings for editing and reloading the .muttrc
 ## ==============================================
 
-macro generic   ,ve   "!gnuclient ~/.muttrc\n"
+macro generic   ,ve   "!sane_editor ~/.muttrc\n"
 macro generic   ,vu   ":source ~/.muttrc\r"
-macro generic   ,va   "!gnuclient ~/.mail_aliases \n"
+macro generic   ,va   "!sane_editor ~/.mail_aliases \n"
 
 ## ======================
 ## Bindings for index
@@ -334,19 +328,13 @@ bind pager     :   enter-command
 bind pager     p   previous-undeleted
 bind pager     n   next-undeleted
 bind pager     \n  next-unread
-bind pager     \cf forget-passphrase
-#bind compose   \n  send-message
+# bind pager     \cf forget-passphrase
 bind compose   s   send-message
 bind pager ,p print-message
 
 macro pager J "!gpg --keyserver wwwkeys.eu.pgp.net --recv-key " "Get PGP Key"
 macro pager K "!gpg --lsign-key " "Sign PGP Key"
 
-# funky gimmick, but I never use it =)
-#macro pager ,s "|festival --tts\r"
-
-#macro index M "c{imap1.bonn.id-pro.net}\n"
-
 macro pager "i" "<sync-mailbox><change-folder>?<toggle-mailboxes>"
 macro index "i" "<sync-mailbox><change-folder>?<toggle-mailboxes>"
 
@@ -385,15 +373,12 @@ color header    green      default  "^date:"
 color header    yellow     default  "^newsgroups:"
 color header    yellow     default  "^reply-to:"
 color header    brightcyan default  "^subject:"
-color header    red        default  "^x-spam-rule:"
+color header    red        default  "^x-spam-score:"
 color header    yellow     default  "^x-mailer:"
 color header    yellow     default  "^message-id:"
 color header    yellow     default  "^Organization:"
 color header    yellow     default  "^Organisation:"  
 color header    yellow     default  "^User-Agent:"  
-color header    yellow     default  "^message-id: .*pine"
-color header    yellow     default  "^X-Fnord:"
-color header    yellow     default  "^X-WebTV-Stationery:"
 color header    yellow     default  "^X-Message-Flag:"
 color header    yellow        default  "^X-Diagnostic:"
 
@@ -422,14 +407,12 @@ color status    white          blue
 color tilde     blue           default
 color tree      brightmagenta  default
 color underline yellow         default
-color body      yellow         default  "[;:]-[)/(|]"  # colorise smileys
-color body      yellow         default  "[;:][)/(|]"
+# color body      yellow         default  "[;:]-[)/(|]"  # colorise smileys
+# color body      yellow         default  "[;:][)/(|]"
 color body      brightblue     default  "(http|ftp|news|telnet|finger)://[^ ]*"
 
 color index     yellow         default  ~N      # New
 color index     yellow         default  ~O      # Old
-# color index     brightgreen    default  '~s tgil'
-# color index     cyan           default  '~s gilbertt ~f cvs-commits-list'
 color index     brightgreen    default  '~p'    # mail to myself
 color index     brightcyan    default  '~P'    # mail from myself
 color index     magenta        default  ~F      # Flagged
@@ -521,3 +504,5 @@ mailboxes `for file in ~/Mail/bugs/*; do echo -n "+bugs/$(basename $file) "; don
 # integration with org mode
 macro index \eR "|~/bin/remember_mail\n"
 macro pager \eR "|~/bin/remember_mail\n"
+
+source /usr/lib/mutt/source-muttrc.d|