.mailcap: convert text from utf-8 to the current locale

[dotfiles.git] / .mailcap

diff --git a/.mailcap b/.mailcap
index 1a2074a73ab3a1b076c113e6a367318115467661..601f870806ba98a040e80be58bacca8f56ab33f0 100644 (file)
--- a/.mailcap
+++ b/.mailcap
@@ -16,7 +16,7 @@ application/postscript; gv %s; description="Postscript files"; test=test -n "$DI
 application/postscript; ghostview %s; description="Postscript files"; test=test -n "$DISPLAY" -a -n "`which ghostview 2>/dev/null`"
 application/postscript; pstotext %s; copiousoutput; description="PostScript files"; test=test -n "`which pstotext 2>/dev/null`"
 application/vnd.oasis.opendocument.text; odt2txt %s | less; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`" -a -n "`which less 2>/dev/null`"
-application/vnd.oasis.opendocument.text; odt2txt %s | more; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`"
+application/vnd.oasis.opendocument.text; odt2txt %s | more; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`" -a -n "`which more 2>/dev/null`"
 application/vnd.oasis.opendocument.text; odt2txt %s; copiousoutput; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`"
 application/x-bittorrent; bittorrent.py %s; test=test -n "$DISPLAY" -a -n "`which bittorrent.py 2>/dev/null`"
 application/x-chm; fbreader %s; description="Compiled HTML files"; test=test -n "$DISPLAY" -a -n "`which fbreader 2>/dev/null`"
@@ -31,8 +31,8 @@ application/msword; doc2html2 %s; copiousoutput; description="M$ Word Text"; tes
 application/msword; catdoc %s; copiousoutput; description="M$ Word Text"; test=test -n "`which catdoc 2>/dev/null`"
 application/msword; wordview %s; edit=libreoffice %s; description="M$ Word Text"; test=test -n "$DISPLAY" -a -n "`which wordview 2>/dev/null`"
 application/vnd.ms-excel; xls2csv %s; copiousoutput; description="M$ Excel files"; test=test -n "`which xls2csv 2>/dev/null`"
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv -f utf-8 | less; edit=libreoffice %s; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which iconv 2>/dev/null`" -a -n "`which less 2>/dev/null`"
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`"
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | less; edit=libreoffice %s; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which less 2>/dev/null`"
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which more 2>/dev/null`"
 application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s -; copiousoutput; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`"
 
 audio/mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
@@ -131,4 +131,5 @@ video/*; mplayer %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`
 x-world/x-vrml; freewrl -url %s; test=test -n "$DISPLAY" -a -n "`which freewrl 2>/dev/null`"; description="VRML world"; nametemplate=%s.wrl
 
 */*; less %s; needsterminal; test=test -n "`which less 2>/dev/null`"
+*/*; more %s; needsterminal; test=test -n "`which more 2>/dev/null`"
 */*; cat -vT %s; copiousoutput