Merge branch 'master' of github.com:maxf130/dotfiles

Conflicts:
	mutt/.mutt/muttrc

diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 7298addc832d61ec243ed3b31b16d05a2f87148e..e19dc769977d4a7ce5fcae68c62751ca1d9ff21b 100644 (file)
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -30,5 +30,9 @@ set alias_file=~/.mutt/aliases
 set sort_alias= alias
 source $alias_file
 
+# View urls more easily with urlview
 macro index \cb   "|urlview\n"
 macro pager \cb   "|urlview\n"
+
+set text_flowed=yes
+set editor="vim +':set textwidth=0' +':set wrapmargin=0' +:set wrap'"