--- lib/mc.ext.in.orig	Wed May 10 17:58:01 2000
+++ lib/mc.ext.in	Tue May 16 15:59:31 2000
@@ -230,26 +230,26 @@
 
 # Manual page
 regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|n)|\.man)$
-	Open=nroff @TROFFASCII@ @MANDOC@ %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ %f
+	Open=nroff @TROFFASCII@ @MANDOC@ '%d/%p' | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ '%d/%p'
 	Icon=man.xpm
 
 # Troff with me macros.
 shell/.me
-	Open=nroff @TROFFASCII@ -me %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ -me %f
+	Open=nroff @TROFFASCII@ -me '%d/%p' | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff @TROFFASCII@ -me '%d/%p'
 	Icon=man.xpm
 
 # Troff with ms macros.
 shell/.ms
-	Open=nroff @TROFFASCII@ -ms %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ -ms %f
+	Open=nroff @TROFFASCII@ -ms '%d/%p' | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff @TROFFASCII@ -ms '%d/%p'
 	Icon=man.xpm
 
 # Manual page - compressed
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
-	Open=gzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} gzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=gzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} gzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
 	Icon=man.xpm
 
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$
@@ -258,8 +258,8 @@
 	Icon=man.xpm
 
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz2$
-	Open=bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=bzip2 -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip2 -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
 	Icon=man.xpm
 
 regex/(read\.?me$)|(README)
@@ -318,11 +318,11 @@
 	Icon=xpm.xpm
 
 include/image-options
-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ee %f &); fi
+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ElectricEyes %f &); fi
 	View=%view{ascii} identify %f
 	#View=%view{ascii} asciiview %f
 	Set root window to this image=background-properties --setwallpaper %f &
-	Display this file=ee %f &
+	Display this file=ElectricEyes %f &
 
 
 ### Sound files ###
@@ -390,14 +390,14 @@
 	View with @X11_WWW@=@X11_WWW@ file://%f
 
 # Microsoft Word Document
-regex/\.([Dd]oc|DOC)$
-	#View=%view{ascii} catdoc -w %f
-	View=%view{ascii} word2x -f text %f -
-	Icon=word.xpm
-type/Microsoft Word Document
-	#View=%view{ascii} catdoc -w %f
-	View=%view{ascii} word2x -f text %f -
-	Icon=word.xpm
+# regex/\.([Dd]oc|DOC)$
+# 	#View=%view{ascii} catdoc -w %f
+# 	View=%view{ascii} word2x -f text %f -
+# 	Icon=word.xpm
+# type/Microsoft Word Document
+# 	#View=%view{ascii} catdoc -w %f
+# 	View=%view{ascii} word2x -f text %f -
+# 	Icon=word.xpm
  
 # Framemaker
 type/FrameMaker
@@ -542,7 +542,7 @@
 shell/.cpio.Z
 	Open=%cd %d/%p#ucpio/
 	View=%view{ascii} compress -dc '%f' | cpio -ictv
-	Extract=compress -dc '%f' | cpio -ic
+	Extract=compress -dc '%d/%p' | cpio -ic
 	Icon=compressed.xpm
 shell/.cpio.gz
 	Open=%cd %d/%p#ucpio/
@@ -590,7 +590,7 @@
 regex/\.s?a$
 	Open=%cd %p#uar
 	#Open=%view{ascii} ar tv %f
-	View=%view{ascii} nm %f
+	View=%view{ascii} nm '%d/%p'
 	Icon=a.xpm
 
 # .so libraries are not manual pages
--- lib/mc.csh.in.orig	Sat Oct  9 15:08:10 1999
+++ lib/mc.csh.in	Sat Oct  9 15:08:28 1999
@@ -1,2 +1,2 @@
-alias mc 'setenv MC `@prefix@/bin/mc -P \!*`; cd $MC; unsetenv MC'
+alias mc 'setenv MC `@prefix@/bin/midc -P \!*`; cd $MC; unsetenv MC'
 
--- lib/mc.sh.in.orig	Sat Oct  9 15:08:13 1999
+++ lib/mc.sh.in	Sat Oct  9 15:08:39 1999
@@ -3,7 +3,7 @@
         mkdir -p ~/.mc/tmp 2> /dev/null
 	chmod 700 ~/.mc/tmp
 	MC=~/.mc/tmp/mc-$$
-	@prefix@/bin/mc -P "$@" > "$MC"
+	@prefix@/bin/midc -P "$@" > "$MC"
 	cd "`cat $MC`"
 	rm "$MC"
         unset MC;