--- a/misc/mc.ext.in.orig	2011-02-06 16:22:50.000000000 +0300

+++ b/misc/mc.ext.in	2011-02-06 21:02:42.130097616 +0300

@@ -111,6 +111,11 @@

 	Open=%cd %p#utar

 	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -

+# .war

+regex/\.war$

+	Open=%cd %p#utar

+	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -

+

 regex/\.tar\.bz$

 	# Open=%cd %p#utar

 	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -

@@ -167,7 +172,7 @@

 # rar

 regex/\.[rR]([aA][rR]|[0-9][0-9])$

 	Open=%cd %p#urar

-	View=%view{ascii} rar v -c- %f

+	View=%view{ascii} unrar l -v -c- %f

 # ALZip

 regex/\.(alz|ALZ)$

@@ -246,10 +251,10 @@

 # 7zip archives (they are not man pages)

 regex/\.(7z|7Z)$

 	Open=%cd %p#u7z

-	View=%view{ascii} 7za l %f 2>/dev/null

+	View=%view{ascii} 7z l %f 2>/dev/null

 # Mailboxes

-type/^ASCII\ mail\ text

+type/mail\ text

 	Open=%cd %p#mailfs

@@ -257,22 +262,25 @@

 # C

 shell/.c

-	Open=%var{EDITOR:vi} %f

+	Include=editor

 # Fortran

 shell/.f

-	Open=%var{EDITOR:vi} %f

+	Include=editor

 # Header

 regex/\.(h|hpp)$

-	Open=%var{EDITOR:vi} %f

+	Include=editor

 # Asm

-shell/.s

-	Open=%var{EDITOR:vi} %f

+regex/\.([Ss]|[Aa]sm|ASM)$

+	Include=editor

 # C++

 regex/\.(C|cc|cpp)$

+	Include=editor

+

+include/editor

 	Open=%var{EDITOR:vi} %f

 # .so libraries

@@ -376,11 +384,17 @@

 type/^Netpbm

 	Include=image

+type/^JNG

+	Include=image

+

+type/^MNG

+	Include=image

+

 shell/.xcf

 	Open=(gimp %f &)

 shell/.xbm

-	Open=bitmap %f

+	Include=image

 shell/.xpm

 	Include=image

@@ -390,7 +404,7 @@

 	Include=image

 include/image

-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi

+	Open=if [ "$DISPLAY" = "" ]; then fbv %f; else (gqview %f &); fi

 	View=%view{ascii} identify %f

 	#View=%view{ascii} asciiview %f

@@ -446,6 +460,9 @@

 regex/\.([mM][kK][vV])$

 	Include=video

+regex/\.([mM][kK][vV])$

+	Include=video

+

 regex/\.([mM][oO][vV]|[qQ][tT])$

 	Include=video

@@ -465,10 +482,14 @@

 	Include=video

 regex/\.([rR][aA]?[mM])$

-	Open=(realplay %f >/dev/null 2>&1 &)

+	Include=video

+

+regex/\.(3[gG][pP])$

+	Include=video

 include/video

-	Open=(mplayer %f >/dev/null 2>&1 &)

+	Open=if which mplayer >/dev/null 2>&1; then (mplayer %f >/dev/null 2>&1 &); else (xine --no-splash -ph %f >/dev/null 2>&1 &); fi

+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'

 	#Open=(gtv %f >/dev/null 2>&1 &)

 	#Open=(xanim %f >/dev/null 2>&1 &)

@@ -492,16 +513,16 @@

 # 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=if test -n "$BROWSER" && test -n "$DISPLAY"; then ($BROWSER file://%d/%p &) >/dev/null 2>&1; else links %f 2>/dev/null || lynx -force_html %f || ${PAGER:-more} %f; fi

 	View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f

 # StarOffice 5.2

 shell/.sdw

-	Open=(ooffice %f &)

+	Open=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

 # StarOffice 6 and OpenOffice.org formats

 regex/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$

-	Open=(ooffice %f &)

+	Open=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

 	View=%view{ascii} odt2txt %f

 # AbiWord

@@ -510,27 +531,32 @@

 # Microsoft Word Document

 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$

-	Open=(abiword %f >/dev/null 2>&1 &)

+	Open=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

 	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=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

 	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=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

+	View=%view{ascii} catdoc -w %f

 # Microsoft Excel Worksheet

 regex/\.([xX][lL][sSwW])$

-	Open=(gnumeric %f >/dev/null 2>&1 &)

+	Open=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

 	View=%view{ascii} xls2csv %f || strings %f

 type/^Microsoft\ Excel

-	Open=(gnumeric %f >/dev/null 2>&1 &)

+	Open=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

 	View=%view{ascii} xls2csv %f || strings %f

 # Use OpenOffice.org to open any MS Office documents

 type/^Microsoft\ Office\ Document

-	Open=(ooffice %f &)

+	Open=if [ -f /usr/bin/loffice ]; then (loffice %f &); else (ooffice %f &); fi

+

+# gnumeric

+regex/\.(gnumeric)$

+	Open=gnumeric %f

 # Framemaker

 type/^FrameMaker

@@ -652,6 +678,17 @@

 	Open=xz -dc %f | %var{PAGER:more}

 	View=%view{ascii} xz -dc %f 2>/dev/null

+### ALT additions ###

+

+# lyx

+regex/\.(lyx|LYX)$

+	Open=lyx %f

+	View=%view{ascii} lyxcat %f

+

+# svg

+regex/\.(svg|SVG)$

+	Open=sodipodi %f

+	View=display %f

 ### Default ###