fix duplicated entries

diff --git a/.muttrc b/.muttrc
index f0cf086e2d7c1213e292bac77e14ac9e1142127a..080cc4536b35ea19214629ab981332b801b0f6e1 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -5,7 +5,6 @@ set alias_file=~/.mail_aliases
 
 source /usr/lib/mutt/source-muttrc.d|
 
-set abort_nosubject=no
 set autoedit
 unset beep
 set bounce=yes
@@ -13,28 +12,17 @@ unset bounce_delivered
 set collapse_unread
 unset confirmappend
 unset confirmcreate
-set delete=yes
 set edit_headers
 set encode_from
 set folder = "~/Mail"
-set mime_forward
 set from = "Don Armstrong <don@donarmstrong.com>"
 unset help
-set header_cache = ~/.mutt/header_cache
 set hide_limited
-set history = 20
 set ignore_list_reply_to
 set implicit_autoview
-set index_format="%4C %Z %[!%k:%M %m.%d.%y] %-15.15F (%?M?C%3M&%4c?) %?H?[%H] ?%s"
 set mailcap_path ="/etc/mailcap"
 unset maildir_trash
-unset mark_old
-set narrow_tree
-set pager_context = 2
 set pager_stop = yes
-set postpone
-set quit = ask-yes
-set record="~/Mail/outbox"
 set reverse_alias = yes
 set save_history = 5
 unset sig_dashes
@@ -43,7 +31,7 @@ unset mark_old
 set sort_re            # set: only put a child in a thread, if starts with Re:
 unset status_on_top    # status line at the top or button?
 unset strict_threads   # thread only by In-Reply-To/References or by Subject.
-set suspend            # Ctrl-Z is able to suspend mutt.
+unset suspend          # Ctrl-Z is able to suspend mutt.
 set thorough_search    # MIME decode before searching.
 unset tilde            # Internal Pager: ~~~~ at and of message?
 unset uncollapse_jump  # don't move pointer, when uncollapsing thread
@@ -93,7 +81,6 @@ set sort_alias=alias
 set display_filter=""  # pipe message through this filter before displaying
 set editor="~/bin/sane_editor"
 set folder=~/Mail      # where are the mailboxes (+ and = are shortcuts)
-set from=""            # From: address (see send-hook my_hdr From)
 set mbox=+inbox                # not used if "set move=no"
 set pager=builtin      # internal pager: "builtin" or e.g. "less -e" 
 set postponed=+postponed       # folder for postponed messages
@@ -135,7 +122,6 @@ set quote_regexp="^( {0,5}[>|:%]| {0,5}[a-z0-9]+[>|]+)+"
 
 set reply_regexp="^((re(\\^[0-9])? ?:|a(nt)?w(ort)?:|wg:|\\(fwd\\))[ \t]*)*"
                        # Subject prefixes (removed on answering and threading)
-#set reply_regexp="^(re|aw):[ \t]+"    # Default
 set date_format="!%a %b %d, %Y at %I:%M:%S%p %Z"
                        # control output of %d in index_format. strftime(3)
                        # here: Monday Dec 06, 1997 at 08:30:42pm CET
@@ -143,11 +129,11 @@ set date_format="!%a %b %d, %Y at %I:%M:%S%p %Z"
 set forward_format="(fwd) %s"
                        # subject of forwarded mails
 
-spam 'X-Spam-Level: \*\*\*\*\*\*\*\*' 8
-spam 'X-Spam-Level: \*\*\*\*\*\*' 6
+spam 'X-Spam-Level: \\*\\*\\*\\*\\*\\*\\*\\*' 8
+spam 'X-Spam-Level: \\*\\*\\*\\*\\*\\*' 6
 spam 'X-Spam-Level: \\*\\*\\*' 3
-spam 'X-Spam-Level: \*\*' 2
-spam 'X-Spam-Level: \*' 1
+spam 'X-Spam-Level: \\*\\*' 2
+spam 'X-Spam-Level: \\*' 1
 set index_format="%4C %Z %[!%k:%M %m.%d.%y] %-15.15F (%?M?C%3M&%4c?) %?H?[%H] ?%s"
 
 set message_format="%-.16n: %s"
@@ -461,9 +447,10 @@ source "~/.mutt/identity_default"
 folder-hook debian- "source ~/.mutt/identity_debian"
 folder-hook bdo_role "source ~/.mutt/identity_owner"
 folder-hook 0_ldo_role "source ~/.mutt/identity_listmaster"
+folder-hook !debian-|bdo_role_|0_ldo_role "source ~/.mutt/identity_default"
 
 # INBOX hook
-folder-hook INBOX "reply-hook \"~C donarm@illinois.edu\" source ~/.mutt/identity_illinois; reply-hook \"~C don@debian.org\" source ~/.mutt/identity_debian; reply-hook \"!(~C donarm@illinois.edu|~C don@debian.org)\" source ~/.mutt/identity_default"
+folder-hook INBOX "reply-hook ~Cdonarm@illinois.edu source ~/.mutt/identity_illinois; reply-hook ~Cdon@debian.org source ~/.mutt/identity_debian; reply-hook !(~Cdonarm@illinois.edu|~Cdon@debian.org) source ~/.mutt/identity_default"
 folder-hook !INBOX "unhook reply-hook"
 
 macro generic ,ad ":source ~/.mutt/identity_debian\r"