29b4ad9
--- mc-4.6.1/lib/mc.ext.in.extensions	2005-07-23 18:51:15.000000000 +0200
b52d9c6
+++ mc-4.6.1/lib/mc.ext.in	2005-08-17 10:30:06.000000000 +0200
b52d9c6
@@ -210,14 +210,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
22fbca8
 regex/\.(h|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)$
22fbca8
+	Inlude=editor
22fbca8
+
22fbca8
+include/editor
22fbca8
 	Open=%var{EDITOR:vi} %f
22fbca8
 
22fbca8
 # Object
b52d9c6
@@ -242,9 +253,11 @@
22fbca8
 # GNU Info page
22fbca8
 type/^Info\ text
22fbca8
 	Open=info -f %f
22fbca8
+	#Open=pinfo %f
22fbca8
 
22fbca8
 shell/.info
22fbca8
 	Open=info -f %f
22fbca8
+	#Open=pinfo %f
22fbca8
 
22fbca8
 # Manual page
22fbca8
 # Exception - .so libraries are not manual pages
b52d9c6
@@ -313,6 +326,12 @@
22fbca8
 type/^Netpbm
22fbca8
 	Include=image
22fbca8
 
22fbca8
+type/^JNG
22fbca8
+	Include=image
22fbca8
+
22fbca8
+type/^MNG
22fbca8
+	Include=image
22fbca8
+
22fbca8
 shell/.xcf
22fbca8
 	Open=gimp %f
22fbca8
 
b52d9c6
@@ -324,7 +343,7 @@
22fbca8
 	View=sxpm %f
22fbca8
 
22fbca8
 include/image
22fbca8
-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
22fbca8
+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (display %f &); fi
22fbca8
 	View=%view{ascii} identify %f
22fbca8
 	#View=%view{ascii} asciiview %f
22fbca8
 
b52d9c6
@@ -342,8 +361,12 @@
22fbca8
        Open=vplay -s 22 %f
22fbca8
 
22fbca8
 regex/\.([mM][pP]3)$
22fbca8
-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
22fbca8
-	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
22fbca8
+	Include=audio
22fbca8
+	#Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
22fbca8
+	#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])$
22fbca8
 	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
b52d9c6
@@ -356,6 +379,9 @@
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
 
22fbca8
+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
 
b52d9c6
@@ -380,20 +406,28 @@
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])$
22fbca8
 	Open=(realplay %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
 
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
 
b52d9c6
@@ -407,7 +441,8 @@
b52d9c6
 
b52d9c6
 # PDF
b52d9c6
 type/^PDF
b52d9c6
-	Open=(xpdf %f &)
b52d9c6
+	Open=(evince %f &)
b52d9c6
+	#Open=(xpdf %f &)
b52d9c6
 	#Open=(acroread %f &)
b52d9c6
 	#Open=(ghostview %f &)
b52d9c6
 	View=%view{ascii} pdftotext %f -
b52d9c6
@@ -418,7 +453,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