--- a/display.rc	Sat Sep 12 15:49:17 1998 +0200
+++ b/display.rc	Sat Sep 12 16:46:30 1998 +0200
@@ -238,14 +238,14 @@
 
 display := displayVar.
 
-(displayVar notNil or:[Display platformName = 'WIN32']) ifTrue:[
+(displayVar notNil or:[isWindowsDisplay]) ifTrue:[
     "/ figure out the hostname of the display,
     "/ to read d_<hostname>.rc
 
-    ((displayVar startsWith:':0') 
+    (isWindowsDisplay
+    or:[(displayVar startsWith:':0') 
     or:[(displayVar startsWith:'unix:')
-    or:[displayVar startsWith:'shm:'
-    or:[isWindowsDisplay]]]) ifTrue:[
+    or:[displayVar startsWith:'shm:']]]) ifTrue:[
 	"running on a local display"
 	display := OperatingSystem getHostName.
     ] ifFalse:[
@@ -264,7 +264,7 @@
 
     display isNil ifTrue:[
 	isWindowsDisplay ifTrue:[
-	    display := 'windows'
+	    display := 'win32'
 	]
     ].
 
@@ -374,13 +374,11 @@
     displayType isNil ifTrue:[
 	"use type of machine smalltalk is running on as default ..."
 
-	(displayVar startsWith:':0') ifTrue:[
+	(isWindowsDisplay
+	or:[displayVar startsWith:':0'
+	or:[displayVar startsWith:(OperatingSystem getHostName , ':0')]]) 
+	ifTrue:[
 	    displayType := OperatingSystem getSystemType.
-	] ifFalse:[
-	    ((displayVar startsWith:(OperatingSystem getHostName , ':0'))
-	    or:[isWindowsDisplay]) ifTrue:[
-		displayType := OperatingSystem getSystemType.
-	    ]
 	]
     ]
 ].