--- a/smalltalk.rc	Tue Oct 19 23:32:52 1999 +0200
+++ b/smalltalk.rc	Tue Oct 26 19:52:47 1999 +0200
@@ -87,7 +87,6 @@
     ].
     Smalltalk exit
 ].
-!
 
 "/
 "/ map Language variable setting to known and handled
@@ -96,7 +95,6 @@
 Language == #De ifTrue:[
     Language := #german
 ].
-!
 
 "/
 "/ check for display-classes being compiled into the system;
@@ -104,27 +102,29 @@
 "/ if not, enter a simple read-eval-print loop
 "/
 Display isNil ifTrue:[
-    DeviceWorkstation notNil ifTrue:[
-	'smalltalk.rc [warning]: No Display connection.' errorPrintCR.
-	'smalltalk.rc [info]: Either set the DISPLAY environment variable,' infoPrintCR.
-	'smalltalk.rc [info]: or start smalltalk with a -display argument.' infoPrintCR.
-	Smalltalk isStandAloneApp ifTrue:[
-	    Smalltalk exit
-	].
+    (args includes:'--noDisplay') ifFalse:[
+	DeviceWorkstation notNil ifTrue:[
+	    'smalltalk.rc [warning]: No Display connection.' errorPrintCR.
+	    'smalltalk.rc [info]: Either set the DISPLAY environment variable,' infoPrintCR.
+	    'smalltalk.rc [info]: or start smalltalk with a -display argument.' infoPrintCR.
+	    Smalltalk isStandAloneApp ifTrue:[
+		Smalltalk exit
+	    ].
 
-	'' errorPrintCR.
-	'Textmode (enter smalltalk expressions terminated by single exclamation mark;' errorPrintCR.
-	OperatingSystem isUNIXlike ifTrue:[
-	    '          CTRL-D to leave line-by-line interpreter.)' errorPrintCR.
+	    '' errorPrintCR.
+	    'Textmode (enter smalltalk expressions terminated by single exclamation mark;' errorPrintCR.
+	    OperatingSystem isUNIXlike ifTrue:[
+		'          CTRL-D to leave line-by-line interpreter.)' errorPrintCR.
+	    ] ifFalse:[
+		'          CTRL-Z to leave line-by-line interpreter.)' errorPrintCR.
+	    ].
+	    Smalltalk readEvalPrint.
+	    Smalltalk exit
 	] ifFalse:[
-	    '          CTRL-Z to leave line-by-line interpreter.)' errorPrintCR.
+	    Smalltalk isStandAloneApp ifFalse:[
+		'smalltalk.rc [warning]: Configuration without display.' errorPrintCR.
+	    ]
 	].
-	Smalltalk readEvalPrint.
-	Smalltalk exit
-    ] ifFalse:[
-	Smalltalk isStandAloneApp ifFalse:[
-	    'smalltalk.rc [warning]: Configuration without display.' errorPrintCR.
-	]
     ].
 ].
 
@@ -175,7 +175,7 @@
 "/ now always get a chance to make some progress ...
 
 Smalltalk addStartBlock:[
-    'private.rc [info]: start timeSlicing...' infoPrintCR.
+    'smalltalk.rc [info]: start timeSlicing...' infoPrintCR.
     Processor startTimeSlicing.
     Processor supportDynamicPriorities:true.
     ObjectMemory backgroundCollectProcess priorityRange:(4 to:9).