commit 6999e6010e7ddceb4f61859d9ef6e3c426e2e233 parent 2de6e6577c90857131b92bcf2d13251d43cc4a03 Author: Antoine Amarilli <a3nm@a3nm.net> Date: Sat, 10 May 2014 18:46:04 +0200 Merge branch 'master' of gitorious.org:myconfig/myconfig Conflicts: apt/server Diffstat:
| apt/server | | | 1 | + |
| mailcap | | | 2 | +- |
| mutt/muttrc | | | 2 | ++ |
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/apt/server b/apt/server @@ -36,3 +36,4 @@ iptables gnuplot elinks fdupes +debian-goodies diff --git a/mailcap b/mailcap @@ -3,7 +3,7 @@ application/x-pdf; /usr/bin/evince '%s'; test=test "$DISPLAY" != ""; description image/gif; /usr/bin/mplayer '%s' text/html; ~/bin/mutt_bgrun firefox %s; nametemplate=%s.html # text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput -text/html; iconv -f %{charset} %s | elinks -dump %{charset} -dump -dump-color-mode 1 -no-references /dev/stdin 2>/dev/null | sed 's/ *$//' | sed 's/ //'; copiousoutput +text/html; iconv -f %{charset} %s | elinks -dump %{charset} -dump -dump-color-mode 1 /dev/stdin 2>/dev/null | sed 's/ *$//' | sed 's/ //'; copiousoutput # text/html; links %s; nametemplate=%s.html # text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput diff --git a/mutt/muttrc b/mutt/muttrc @@ -15,6 +15,8 @@ set query_command="lbdbq '%s'" set editor="vim -c 'silent% s:\\%x1B\\[.\\{-}m::ge' -c 'set tw=72' +1 +/^$/" # == Personal stuff == +# undo the effect of my_hdr for specific hooks +send-hook . "unmy_hdr From:" source "~/.mutt/perso" # == Encoding ==