0bf1824
diff -up mc-4.6.2-pre1/configure.extensions mc-4.6.2-pre1/configure
0bf1824
--- mc-4.6.2-pre1/configure.extensions	2007-09-11 16:33:32.000000000 +0200
0bf1824
+++ mc-4.6.2-pre1/configure	2008-03-07 14:28:51.000000000 +0100
0bf1824
@@ -5736,7 +5736,7 @@
4567fd4
 fi
4567fd4
 
4567fd4
 
4567fd4
-for ac_prog in gnome-moz-remote mozilla konqueror opera netscape
4567fd4
+for ac_prog in firefox gnome-moz-remote mozilla konqueror opera netscape
4567fd4
 do
4567fd4
   # Extract the first word of "$ac_prog", so it can be a program name with args.
4567fd4
 set dummy $ac_prog; ac_word=$2
0bf1824
diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in
0bf1824
--- mc-4.6.2-pre1/lib/mc.ext.in.extensions	2006-12-28 04:57:01.000000000 +0100
0bf1824
+++ mc-4.6.2-pre1/lib/mc.ext.in	2008-03-07 14:28:31.000000000 +0100
0bf1824
@@ -119,6 +119,11 @@
0bf1824
 	Open=%cd %p#utar
0bf1824
 	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
0bf1824
 
0bf1824
+# .tar.lzma, .tlz
0bf1824
+regex/\.t(ar\.lzma|lz)$
0bf1824
+	Open=%cd %p#utar
0bf1824
+	View=%view{ascii} lzma -dc %f 2>/dev/null | tar tvvf -
0bf1824
+
0bf1824
 # .tar.F - used in QNX
0bf1824
 regex/\.tar\.F$
0bf1824
 	# Open=%cd %p#utar
0bf1824
@@ -220,14 +225,25 @@
22fbca8
 
22fbca8
 # C
22fbca8
 shell/.c
22fbca8
-	Open=%var{EDITOR:vi} %f
22fbca8
+	Include=editor
22fbca8
 
22fbca8
 # Fortran
22fbca8
 shell/.f
22fbca8
-	Open=%var{EDITOR:vi} %f
22fbca8
+	Include=editor
22fbca8
 	
22fbca8
 # Header
0bf1824
-regex/\.(h|hpp)$
0bf1824
+regex/\.([Hh]|[Hh]pp|HPP)$
22fbca8
+	Include=editor
22fbca8
+
22fbca8
+# Asm
22fbca8
+regex/\.([Ss]|[Aa]sm|ASM)$
22fbca8
+	Include=editor
22fbca8
+
22fbca8
+# C++
22fbca8
+regex/\.(C|cc|[Cc]pp|CPP)$
1ee97a4
+	Include=editor
22fbca8
+
22fbca8
+include/editor
22fbca8
 	Open=%var{EDITOR:vi} %f
22fbca8
 
22fbca8
 # Object
0bf1824
@@ -251,10 +267,12 @@
909e46b
 
22fbca8
 # GNU Info page
22fbca8
 type/^Info\ text
909e46b
-	Open=info -f %f
909e46b
+	#Open=info -f %f
909e46b
+	Open=pinfo %f
22fbca8
 
22fbca8
 shell/.info
909e46b
-	Open=info -f %f
909e46b
+	#Open=info -f %f
909e46b
+	Open=pinfo %f
22fbca8
 
22fbca8
 # Manual page
22fbca8
 # Exception - .so libraries are not manual pages
0bf1824
@@ -298,6 +316,10 @@
0bf1824
 	Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
0bf1824
 	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
0bf1824
 
0bf1824
+regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$
0bf1824
+	Open=case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
0bf1824
+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
0bf1824
+
0bf1824
 
0bf1824
 ### Images ###
0bf1824
 
0bf1824
@@ -328,18 +350,24 @@
22fbca8
 type/^Netpbm
22fbca8
 	Include=image
22fbca8
 
22fbca8
+type/^JNG
22fbca8
+	Include=image
22fbca8
+
22fbca8
+type/^MNG
22fbca8
+	Include=image
22fbca8
+
22fbca8
 shell/.xcf
909e46b
 	Open=(gimp %f &)
909e46b
 
909e46b
 shell/.xbm
909e46b
-	Open=bitmap %f
909e46b
+	Include=image
22fbca8
 
909e46b
 shell/.xpm
909e46b
 	Include=image
22fbca8
 	View=sxpm %f
22fbca8
 
22fbca8
 include/image
22fbca8
-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
0bf1824
+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (xdg-open %f &); fi
22fbca8
 	View=%view{ascii} identify %f
22fbca8
 	#View=%view{ascii} asciiview %f
22fbca8
 
0bf1824
@@ -347,7 +375,8 @@
f31b972
 ### Sound files ###
f31b972
 
f31b972
 regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
f31b972
-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
f31b972
+	Open=play %f
f31b972
+#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
f31b972
 
f31b972
 regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
f31b972
        Open=mikmod %f
0bf1824
@@ -357,11 +386,16 @@
22fbca8
        Open=vplay -s 22 %f
22fbca8
 
22fbca8
 regex/\.([mM][pP]3)$
f31b972
-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
22fbca8
-	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
22fbca8
+	Include=audio
f31b972
+#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
f31b972
+#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
22fbca8
+
22fbca8
+regex/\.([mM][kK][aA])$
22fbca8
+	Include=audio
22fbca8
 
22fbca8
 regex/\.([oO][gG][gG])$
f31b972
-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
f31b972
+	Open=ogg123 %f
f31b972
+#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
f31b972
 	View=%view{ascii} ogginfo %s
f31b972
 
f31b972
 regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
0bf1824
@@ -371,11 +405,15 @@
22fbca8
 	Open=mplayer -vo null %f
22fbca8
 	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
22fbca8
 
4567fd4
+include/audio
22fbca8
+	Open=mplayer %f
22fbca8
+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
22fbca8
 
22fbca8
 ### Play lists ###
22fbca8
 
f31b972
 regex/\.([mM]3[uU]|[pP][lL][sS])$
f31b972
-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
f31b972
+	Open=mplayer -vo null -playlist %f
f31b972
+#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
f31b972
 
f31b972
 
f31b972
 ### Video ###
0bf1824
@@ -395,20 +433,27 @@
22fbca8
 regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
22fbca8
 	Include=video
22fbca8
 
22fbca8
+regex/\.([mM][kK][vV])$
22fbca8
+	Include=video
22fbca8
+
22fbca8
 regex/\.([vV][oO][bB])$
22fbca8
 	Include=video
22fbca8
 
22fbca8
 regex/\.([wW][mM][vV])$
22fbca8
 	Include=video
22fbca8
 
22fbca8
+regex/\.([fF][lL][iIcC])$
22fbca8
+	Include=video
22fbca8
+
22fbca8
 regex/\.([oO][gG][mM])$
22fbca8
 	Include=video
22fbca8
 
22fbca8
 regex/\.([rR][aA]?[mM])$
d42c8be
-	Open=(realplay %f >/dev/null 2>&1 &)
d42c8be
+	Include=video
22fbca8
 
22fbca8
 include/video
22fbca8
 	Open=(mplayer %f >/dev/null 2>&1 &)
22fbca8
+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
22fbca8
 	#Open=(gtv %f >/dev/null 2>&1 &)
22fbca8
 	#Open=(xanim %f >/dev/null 2>&1 &)
22fbca8
 
0bf1824
@@ -417,12 +462,13 @@
cfc943f
 
cfc943f
 # Postscript
cfc943f
 type/^PostScript
cfc943f
-	Open=(gv %f &)
beabfeb
+	Open=(evince %f >/dev/null 2>&1 &)
cfc943f
 	View=%view{ascii} ps2ascii %f
b52d9c6
 
b52d9c6
 # PDF
b52d9c6
 type/^PDF
b52d9c6
-	Open=(xpdf %f &)
0bf1824
+	Open=(xdg-open %f >/dev/null 2>&1 &)
beabfeb
+	#Open=(xpdf %f >/dev/null 2>&1 &)
b52d9c6
 	#Open=(acroread %f &)
b52d9c6
 	#Open=(ghostview %f &)
b52d9c6
 	View=%view{ascii} pdftotext %f -
0bf1824
@@ -433,7 +479,7 @@
b52d9c6
 # html
b52d9c6
 regex/\.([hH][tT][mM][lL]?)$
b52d9c6
 	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
b52d9c6
-	View=%view{ascii} lynx -dump -force_html %f
b52d9c6
+	View=%view{ascii} links -dump %f
b52d9c6
 
b52d9c6
 # StarOffice 5.2
b52d9c6
 shell/.sdw
0bf1824
@@ -450,22 +496,27 @@
909e46b
 
909e46b
 # Microsoft Word Document
909e46b
 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
909e46b
-	Open=(abiword %f >/dev/null 2>&1 &)
909e46b
+	Open=(ooffice %f &)
909e46b
+#	Open=(abiword %f >/dev/null 2>&1 &)
909e46b
 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
909e46b
 type/^Microsoft\ Word
909e46b
-	Open=(abiword %f >/dev/null 2>&1 &)
909e46b
+	Open=(ooffice %f &)
909e46b
+#	Open=(abiword %f >/dev/null 2>&1 &)
909e46b
 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
909e46b
 
909e46b
 # RTF document
909e46b
 regex/\.([rR][tT][fF])$
909e46b
-	Open=(abiword %f >/dev/null 2>&1 &)
909e46b
+	Open=(ooffice %f &)
909e46b
+#	Open=(abiword %f >/dev/null 2>&1 &)
909e46b
 
909e46b
 # Microsoft Excel Worksheet
909e46b
 regex/\.([xX][lL][sSwW])$
909e46b
-	Open=(gnumeric %f >/dev/null 2>&1 &)
909e46b
+	Open=(ooffice %f &)
909e46b
+#	Open=(gnumeric %f >/dev/null 2>&1 &)
909e46b
 	View=%view{ascii} xls2csv %f || strings %f
909e46b
 type/^Microsoft\ Excel
909e46b
-	Open=(gnumeric %f >/dev/null 2>&1 &)
909e46b
+	Open=(ooffice %f &)
909e46b
+#	Open=(gnumeric %f >/dev/null 2>&1 &)
909e46b
 	View=%view{ascii} xls2csv %f || strings %f
909e46b
 
909e46b
 # Use OpenOffice.org to open any MS Office documents
0bf1824
@@ -542,6 +593,11 @@
0bf1824
 	Open=gzip -dc %f | %var{PAGER:more}
0bf1824
 	View=%view{ascii} gzip -dc %f 2>/dev/null
0bf1824
 
0bf1824
+# lzma
0bf1824
+regex/\.lzma$
0bf1824
+	Open=lzma -dc %f | %var{PAGER:more}
0bf1824
+	View=%view{ascii} lzma -dc %f 2>/dev/null
0bf1824
+
0bf1824
 
0bf1824
 ### Default ###
0bf1824
 
0bf1824
diff -up mc-4.6.2-pre1/configure.ac.extensions mc-4.6.2-pre1/configure.ac
0bf1824
--- mc-4.6.2-pre1/configure.ac.extensions	2007-09-10 16:25:30.000000000 +0200
0bf1824
+++ mc-4.6.2-pre1/configure.ac	2008-03-07 14:28:51.000000000 +0100
0bf1824
@@ -83,7 +83,7 @@
0bf1824
 AC_CHECK_TOOL(AR, ar, ar)
0bf1824
 
0bf1824
 dnl Only list browsers here that can be run in background (i.e. with `&')
0bf1824
-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
0bf1824
+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
0bf1824
 
0bf1824
 dnl
0bf1824
 dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.