Test for existence of more

diff --git a/.mailcap b/.mailcap
index b667ff863f1cedc5ac8e669364731119cfa3c25e..d4e8031aa57e724073d7007a3c874a47e3d07bef 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`"
@@ -32,7 +32,7 @@ application/msword; catdoc %s; copiousoutput; description="M$ Word Text"; test=t
 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.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 - | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 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`" -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