fix hooks for mail; use new pick a quote for signature

diff --git a/.muttrc b/.muttrc
index f8b793c537188847d74a9179cedddaf43d7ff262..571094a589ba66153065e11eb75252efa94d83f7 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -131,7 +131,7 @@ set sort_alias=alias
 
 #reset dotlock_program # where to find mutt_dotlock (reset uses default)
 set display_filter=""  # pipe message through this filter before displaying
 
 #reset dotlock_program # where to find mutt_dotlock (reset uses default)
 set display_filter=""  # pipe message through this filter before displaying

-set editor="~/bin/sane_editor +\`awk '/^$/ {print NR+1; exit}' %s\` %s"
+set editor="~/bin/sane_editor"

 set folder=~/Mail      # where are the mailboxes (+ and = are shortcuts)
 #set folder="{luv}Mail"        # where are the mailboxes (+ and = are shortcuts)
 set from=""            # From: address (see send-hook my_hdr From)
 set folder=~/Mail      # where are the mailboxes (+ and = are shortcuts)
 #set folder="{luv}Mail"        # where are the mailboxes (+ and = are shortcuts)
 set from=""            # From: address (see send-hook my_hdr From)


@@ -703,33 +703,26 @@ hdr_order Date: From: To: Cc: X-Newsreader: X-Mailer: Organization: Organisation
 ## addresses to you in the folder index as "personal" using the flag '+'.
 #set alternates=((tom|gilbertt)@snowman.net|.*@linuxbrit.*|.*@offended.*|giblet@lunixbrat.com)
 
 ## addresses to you in the folder index as "personal" using the flag '+'.
 #set alternates=((tom|gilbertt)@snowman.net|.*@linuxbrit.*|.*@offended.*|giblet@lunixbrat.com)
 

-# Set the defaults for folders:
-folder-hook .    set timeout=30
-folder-hook .    set sort=threads
-folder-hook .    set sort_aux=date-received
-# When I'm in the main index, check more often :)
-#folder-hook "!"  set timeout=5
-# Mail in my inbox is more date than thread sensitive...
-folder-hook "!"  set sort=date-received
-folder-hook "sent"  set sort=date-received
-
-#folder-hook .    set signature=~/.signature
-
-#folder-hook .    unmy_hdr *

 folder-hook .    my_hdr "From: Don Armstrong <don@donarmstrong.com>"
 folder-hook .    set signature="~/.signature" 
 folder-hook .    unmy_hdr "Reply-To:"
 folder-hook .    unmy_hdr "Cc:"
 
 # bug hooks
 folder-hook .    my_hdr "From: Don Armstrong <don@donarmstrong.com>"
 folder-hook .    set signature="~/.signature" 
 folder-hook .    unmy_hdr "Reply-To:"
 folder-hook .    unmy_hdr "Cc:"
 
 # bug hooks

-reply-hook ~A unmy_hdr "X-Debbugs-No-Ack";

 #reply-hook "~h X-Debian-PR" my_hdr "X-Debbugs-No-Ack: yes no ack";
 send-hook ~A unmy_hdr "X-Debbugs-No-Ack";
 send-hook "(~C submit@bugs.debian.org |~C control@bugs.debian.org |~C \d+@bugs.debian.org)" my_hdr "X-Debbugs-No-Ack: yes no ack"
 
 #reply-hook "~h X-Debian-PR" my_hdr "X-Debbugs-No-Ack: yes no ack";
 send-hook ~A unmy_hdr "X-Debbugs-No-Ack";
 send-hook "(~C submit@bugs.debian.org |~C control@bugs.debian.org |~C \d+@bugs.debian.org)" my_hdr "X-Debbugs-No-Ack: yes no ack"
 

+
+set signature='~/lib/signature_stuff/pick_a_quote.pl|'
+
+send-hook '~t build ~s success' "set signature='' pgp_autosign=yes indent_string='' edit_headers=yes editor='~/bin/buildd_script' fast_reply=yes pgp_create_traditional=yes include=yes pgp_sign_as=0x9D05D0BE"
+send-hook '!(~t build ~s success)' "set pgp_autosign=yes indent_string='> ' editor='~/bin/sane_editor' fast_reply=no pgp_create_traditional=no include=yes signature='~/lib/signature_stuff/pick_a_quote.pl|' pgp_sign_as=0xD98C0FBA"
+
+

 # Fix the Mail-Followup-To for sdondley
 # Fix the Mail-Followup-To for sdondley

-reply-hook . unmy_hdr "Mail-Followup-To";
-reply-hook "(~f sdondley@gmail.com|~f s@gmail.com|~f s@dondley.com)" my_hdr "Mail-Followup-To: Don Armstrong <don@donarmstrong.com>";
+send-hook . unmy_hdr "Mail-Followup-To";
+send-hook "(~f sdondley@gmail.com|~f s@gmail.com|~f s@dondley.com)" my_hdr "Mail-Followup-To: Don Armstrong <don@donarmstrong.com>";

 
 # Debian folder hooks
 folder-hook debian my_hdr "From: Don Armstrong <don@debian.org>"
 
 # Debian folder hooks
 folder-hook debian my_hdr "From: Don Armstrong <don@debian.org>"


@@ -746,9 +739,6 @@ folder-hook 0_ldo_role my_hdr "Cc: listmaster@lists.debian.org"
 macro generic   ,ad   my_hdr "From: Don Armstrong <don@debian.org>"
 macro generic   ,an   my_hdr "From: Don Armstrong <don@donarmstrong.com>"
 
 macro generic   ,ad   my_hdr "From: Don Armstrong <don@debian.org>"
 macro generic   ,an   my_hdr "From: Don Armstrong <don@donarmstrong.com>"
 

-send-hook ~A '`/home/don/lib/signature_stuff/pick_a_quote.pl` set-signature "~/.signature"'
-
-

 open-hook   \\.gz$ "gzip -cd %f > %t" 
 close-hook  \\.gz$ "gzip -c %t > %f" 
 append-hook \\.gz$ "gzip -c %t >> %f"
 open-hook   \\.gz$ "gzip -cd %f > %t" 
 close-hook  \\.gz$ "gzip -c %t > %f" 
 append-hook \\.gz$ "gzip -c %t >> %f"