147 lines
5.1 KiB
Diff
147 lines
5.1 KiB
Diff
diff -up mc-4.7.0-pre4/configure.ac.extensions mc-4.7.0-pre4/configure.ac
|
|
--- mc-4.7.0-pre4/configure.ac.extensions 2009-10-30 19:44:38.000000000 +0100
|
|
+++ mc-4.7.0-pre4/configure.ac 2009-12-10 20:41:43.000000000 +0100
|
|
@@ -69,7 +69,7 @@ AC_PROG_LN_S
|
|
AC_CHECK_TOOL(AR, ar, ar)
|
|
|
|
dnl Only list browsers here that can be run in background (i.e. with `&')
|
|
-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
|
|
+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
|
|
|
|
dnl
|
|
dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used.
|
|
diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in
|
|
--- mc-4.7.0-pre4/misc/mc.ext.in.extensions 2009-10-29 20:02:37.000000000 +0100
|
|
+++ mc-4.7.0-pre4/misc/mc.ext.in 2009-12-10 20:46:47.000000000 +0100
|
|
@@ -226,8 +226,8 @@ regex/\.rpm$
|
|
|
|
# deb
|
|
regex/\.u?deb$
|
|
- Open=%cd %p#deb
|
|
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
|
|
+ Open=%cd %p#uar
|
|
+ View=%view{ascii} file %f && nm %f
|
|
|
|
# dpkg
|
|
shell/.debd
|
|
@@ -387,7 +387,7 @@ shell/.ico
|
|
Include=image
|
|
|
|
include/image
|
|
- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
|
|
+ Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (eog %f &); fi
|
|
View=%view{ascii} identify %f
|
|
#View=%view{ascii} asciiview %f
|
|
|
|
@@ -395,7 +395,8 @@ include/image
|
|
### Sound files ###
|
|
|
|
regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
|
|
- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
+ Include=audio
|
|
+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
|
|
regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
|
|
Open=mikmod %f
|
|
@@ -405,15 +406,22 @@ regex/\.([wW][aA][wW]22)$
|
|
Open=vplay -s 22 %f
|
|
|
|
regex/\.([mM][pP]3)$
|
|
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
|
|
+ Include=audio
|
|
+# Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
+# View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
|
|
+
|
|
+regex/\.([mM][kK][aA])$
|
|
+ Include=audio
|
|
|
|
regex/\.([oO][gG][gG|aA|vV|xX])$
|
|
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
+ Include=audio
|
|
+# Open=ogg123 %f
|
|
+# Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
View=%view{ascii} ogginfo %s
|
|
|
|
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
|
|
- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
+ Include=audio
|
|
+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
|
|
regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
|
|
Open=timidity %f
|
|
@@ -422,11 +430,15 @@ regex/\.([wW][mM][aA])$
|
|
Open=mplayer -vo null %f
|
|
View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
|
|
|
|
+include/audio
|
|
+ Open=mplayer %f
|
|
+ View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
|
|
|
|
### Play lists ###
|
|
|
|
regex/\.([mM]3[uU]|[pP][lL][sS])$
|
|
- Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
|
|
+ Open=mplayer -vo null -playlist %f
|
|
+# Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
|
|
|
|
|
|
### Video ###
|
|
@@ -471,12 +486,12 @@ include/video
|
|
|
|
# Postscript
|
|
type/^PostScript
|
|
- Open=(gv %f &)
|
|
+ Open=(xdg-open %f &)
|
|
View=%view{ascii} ps2ascii %f
|
|
|
|
# PDF
|
|
type/^PDF
|
|
- Open=(xpdf %f &)
|
|
+ Open=(xdg-open %f &)
|
|
#Open=(acroread %f &)
|
|
#Open=(ghostview %f &)
|
|
View=%view{ascii} pdftotext %f -
|
|
@@ -486,7 +501,7 @@ type/^PDF
|
|
|
|
# html
|
|
regex/\.([hH][tT][mM][lL]?)$
|
|
- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
|
|
+ Open=xdg-open file://%d/%p 1>&2
|
|
View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
|
|
|
|
# StarOffice 5.2
|
|
@@ -504,22 +519,27 @@ shell/.abw
|
|
|
|
# Microsoft Word Document
|
|
regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
|
|
- Open=(abiword %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=(abiword %f >/dev/null 2>&1 &)
|
|
View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
|
|
type/^Microsoft\ Word
|
|
- Open=(abiword %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=(abiword %f >/dev/null 2>&1 &)
|
|
View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
|
|
|
|
# RTF document
|
|
regex/\.([rR][tT][fF])$
|
|
- Open=(abiword %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=(abiword %f >/dev/null 2>&1 &)
|
|
|
|
# Microsoft Excel Worksheet
|
|
regex/\.([xX][lL][sSwW])$
|
|
- Open=(gnumeric %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=(gnumeric %f >/dev/null 2>&1 &)
|
|
View=%view{ascii} xls2csv %f || strings %f
|
|
type/^Microsoft\ Excel
|
|
- Open=(gnumeric %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=(gnumeric %f >/dev/null 2>&1 &)
|
|
View=%view{ascii} xls2csv %f || strings %f
|
|
|
|
# Use OpenOffice.org to open any MS Office documents
|