--- a/display.rc	Thu Jul 18 21:47:33 1996 +0200
+++ b/display.rc	Fri Jul 19 11:27:20 1996 +0200
@@ -149,10 +149,12 @@
 "find display name from environment or -display argument"
 
 arguments := Smalltalk commandLineArguments.
-arguments notNil ifTrue:[
+arguments size > 0 ifTrue:[
     idx := arguments indexOf:'-display'.
     idx ~~ 0 ifTrue:[
 	displayVar := arguments at:idx + 1.
+	arguments removeAtIndex:idx+1.
+	arguments removeAtIndex:idx.
     ].
 ].
 displayVar isNil ifTrue:[

--- a/private.rc	Thu Jul 18 21:47:33 1996 +0200
+++ b/private.rc	Fri Jul 19 11:27:20 1996 +0200
@@ -211,7 +211,7 @@
 ].
 !
 
-(Smalltalk commandLineArguments includes:'-q') ifFalse:[
+(Smalltalk commandLine includes:'-q') ifFalse:[
     "/
     "/ this turns off/on information messages from classes
     "/ (such as 'D8IMAGE: allocating colors ...'

--- a/smalltalk.rc	Thu Jul 18 21:47:33 1996 +0200
+++ b/smalltalk.rc	Fri Jul 19 11:27:20 1996 +0200
@@ -46,7 +46,7 @@
 |args|
 
 args := Smalltalk commandLineArguments.
-args last = '--buildClasses' ifTrue:[
+((args size > 0) and:[args last = '--buildClasses']) ifTrue:[
     'binary' asFilename isDirectory ifFalse:[
 	'no binary directory for classes.' printNL.
     ] ifTrue:[