--- a/display.rc	Sat Apr 25 19:59:02 1998 +0200
+++ b/display.rc	Sat Apr 25 22:51:55 1998 +0200
@@ -50,17 +50,17 @@
 
     rdr := Smalltalk at:#XBMReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-xbitmap' suffix:'xbm' reader:rdr.
-        MIMETypes defineImageType:nil               suffix:'bm'  reader:rdr.
+	MIMETypes defineImageType:'image/x-xbitmap' suffix:'xbm' reader:rdr.
+	MIMETypes defineImageType:nil               suffix:'bm'  reader:rdr.
     ].
     rdr := Smalltalk at:#TIFFReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/tiff'      suffix:'tif'  reader:rdr.
-        MIMETypes defineImageType:nil               suffix:'tiff' reader:rdr.
+	MIMETypes defineImageType:'image/tiff'      suffix:'tif'  reader:rdr.
+	MIMETypes defineImageType:nil               suffix:'tiff' reader:rdr.
     ].
     rdr := Smalltalk at:#GIFReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/gif'	suffix:'gif'  reader:rdr.
+	MIMETypes defineImageType:'image/gif'   suffix:'gif'  reader:rdr.
     ].
 
     "/ still to come ...
@@ -70,8 +70,8 @@
 
     rdr := Smalltalk at:#SunRasterReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:nil               suffix:'im8'  reader:rdr.
-        MIMETypes defineImageType:nil               suffix:'icon'  reader:rdr.
+	MIMETypes defineImageType:nil               suffix:'im8'  reader:rdr.
+	MIMETypes defineImageType:nil               suffix:'icon'  reader:rdr.
     ].
 
     "/ still to come ...
@@ -79,63 +79,63 @@
 
     rdr := Smalltalk at:#WindowsIconReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-MS-bmp'  suffix:'bmp' reader:rdr.
-        MIMETypes defineImageType:nil               suffix:'ico' reader:rdr.
+	MIMETypes defineImageType:'image/x-MS-bmp'  suffix:'bmp' reader:rdr.
+	MIMETypes defineImageType:nil               suffix:'ico' reader:rdr.
     ].
 
     rdr := Smalltalk at:#JPEGReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/jpeg'  suffix:'jpg' reader:rdr.
-        MIMETypes defineImageType:nil           suffix:'jpeg' reader:rdr.
+	MIMETypes defineImageType:'image/jpeg'  suffix:'jpg' reader:rdr.
+	MIMETypes defineImageType:nil           suffix:'jpeg' reader:rdr.
     ].
 
     rdr := Smalltalk at:#PBMReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-portable-pixmap'  suffix:'ppm' reader:rdr.
-        MIMETypes defineImageType:'image/x-portable-bitmap'  suffix:'pbm' reader:rdr.
-        MIMETypes defineImageType:'image/x-portable-graymap' suffix:'pgm' reader:rdr.
-        MIMETypes defineImageType:'image/x-portable-anymap'  suffix:'pnm' reader:rdr.
+	MIMETypes defineImageType:'image/x-portable-pixmap'  suffix:'ppm' reader:rdr.
+	MIMETypes defineImageType:'image/x-portable-bitmap'  suffix:'pbm' reader:rdr.
+	MIMETypes defineImageType:'image/x-portable-graymap' suffix:'pgm' reader:rdr.
+	MIMETypes defineImageType:'image/x-portable-anymap'  suffix:'pnm' reader:rdr.
     ].
 
     rdr := Smalltalk at:#ST80FormReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:nil           suffix:'form' reader:rdr.
+	MIMETypes defineImageType:nil           suffix:'form' reader:rdr.
     ].
 
     rdr := Smalltalk at:#FaceReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:nil           suffix:'face' reader:rdr.
+	MIMETypes defineImageType:nil           suffix:'face' reader:rdr.
     ].
 
     rdr := Smalltalk at:#XPMReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-xpixmap' suffix:'xpm' reader:rdr.
-        MIMETypes defineImageType:nil               suffix:'pm' reader:rdr.
+	MIMETypes defineImageType:'image/x-xpixmap' suffix:'xpm' reader:rdr.
+	MIMETypes defineImageType:nil               suffix:'pm' reader:rdr.
     ].
 
     rdr := Smalltalk at:#PCXReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-pcx' suffix:'pcx' reader:rdr.
+	MIMETypes defineImageType:'image/x-pcx' suffix:'pcx' reader:rdr.
     ].
 
     rdr := Smalltalk at:#TargaReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-targa' suffix:'tga' reader:rdr.
+	MIMETypes defineImageType:'image/x-targa' suffix:'tga' reader:rdr.
     ].
 
     rdr := Smalltalk at:#XWDReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-xwindowdump' suffix:'xwd' reader:rdr.
+	MIMETypes defineImageType:'image/x-xwindowdump' suffix:'xwd' reader:rdr.
     ].
 
     rdr := Smalltalk at:#BlitImageReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:nil suffix:'48x48x1' reader:rdr.
+	MIMETypes defineImageType:nil suffix:'48x48x1' reader:rdr.
     ].
 
     rdr := Smalltalk at:#IrisRGBReader ifAbsent:nil.
     rdr notNil ifTrue:[
-        MIMETypes defineImageType:'image/x-rgb' suffix:'rgb' reader:rdr.
+	MIMETypes defineImageType:'image/x-rgb' suffix:'rgb' reader:rdr.
     ].
 
     "/ experimanetal and not yet delivered
@@ -419,7 +419,15 @@
 	View defaultStyle:#iris
     ].
     type = 'linux' ifTrue:[
-	View defaultStyle:#iris 
+	"/ if on the local display, and WINDOWMANAGER is fvwm95,
+	"/ use win95 style as default.
+	(((OperatingSystem getEnvironment:'DISPLAY') = ':0')
+	and:[((OperatingSystem getEnvironment:'WINDOWMANAGER') endsWith:'fvwm95')])
+	ifTrue:[
+	    View defaultStyle:#mswindows95 
+	] ifFalse:[
+	    View defaultStyle:#iris 
+	]
     ].
     type = 'hpux' ifTrue:[
 	View defaultStyle:#'motif' 
@@ -433,7 +441,7 @@
     (type = 'win32') ifTrue:[
 	(Number readFromString:((OperatingSystem getSystemInfo) at:#release) onError:0)
 	>= 4.0 ifTrue:[
-	    View defaultStyle:#'mswindows3' 
+	    View defaultStyle:#'mswindows95' 
 	] ifFalse:[
 	    View defaultStyle:#'mswindows' 
 	]