fail gracefully in the absense of the aliases file

[etc/mutt.git] / .mutt / muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 897c47971161410f815a013a039b7d7ef6704923..35915bc528639afb2e4e26f8b4e28068f7df3b3f 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -34,8 +34,6 @@ set my_confdir="~/.mutt"
 # Type: path
 # Default: "~/.muttrc"
 # 
 # Type: path
 # Default: "~/.muttrc"
 # 

-set alias_file="$my_confdir/aliases"
-source $my_confdir/aliases

 # 
 # The default file in which to save aliases created by the 
 # ``create-alias'' function.
 # 
 # The default file in which to save aliases created by the 
 # ``create-alias'' function.


@@ -715,7 +713,7 @@ set edit_headers=yes
 # It defaults to the value of the VISUAL, or EDITOR, environment
 # variable, or to the string "/usr/bin/editor" if neither of those are set.
 # 
 # It defaults to the value of the VISUAL, or EDITOR, environment
 # variable, or to the string "/usr/bin/editor" if neither of those are set.
 # 

-set editor="~/.bin/mail/mailplate --edit --auto --keep-unknown"
+set editor="mailplate --edit --auto --keep-unknown"

 # 
 # set encode_from=no
 #
 # 
 # set encode_from=no
 #


@@ -777,6 +775,7 @@ set fast_reply=yes
 # This variable controls whether or not attachments on outgoing messages
 # are saved along with the main body of your message.
 # 
 # This variable controls whether or not attachments on outgoing messages
 # are saved along with the main body of your message.
 # 

+set fcc_attach=no

 # 
 # set fcc_clear=no
 #
 # 
 # set fcc_clear=no
 #


@@ -3711,7 +3710,7 @@ set sig_dashes=no
 # For the default value it would be:
 # 
 # ~f joe | ~s joe
 # For the default value it would be:
 # 
 # ~f joe | ~s joe

-# 
+set simple_search="~L %s | ~s %s"

 # 
 # set smart_wrap=yes
 #
 # 
 # set smart_wrap=yes
 #


@@ -4444,3 +4443,8 @@ source $my_confdir/hooks
 
 set my_mailboxes = `ls ~/.var/offlineimap/mailboxes 2>/dev/null || echo /dev/null`
 source $my_mailboxes
 
 set my_mailboxes = `ls ~/.var/offlineimap/mailboxes 2>/dev/null || echo /dev/null`
 source $my_mailboxes

+
+# this sucks a bit since we hardcode ~/.mutt instead of using $my_confdir, but
+# apparently we can't expand that mutt variable for the subshell...
+set alias_file = `ls ~/.mutt/aliases 2>/dev/null || echo /dev/null`
+source $alias_file