Smalltalk.st
changeset 22636 7607be4b8c15
parent 22572 5063942d9bcd
child 22650 580198cee5f9
--- a/Smalltalk.st	Tue Mar 20 11:46:00 2018 +0100
+++ b/Smalltalk.st	Tue Mar 20 12:51:25 2018 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
@@ -3958,13 +3956,18 @@
 lateOpenDisplay
     "this is called when a view is opened without a display being already opened."
     
-    Smalltalk openDisplay.
-    Display notNil ifTrue:[ 
+    |display|
+
+    display := Smalltalk openDisplay.
+    display notNil ifTrue:[ 
         IsRepl ifFalse:[
-            Display exitOnLastClose:true.
+            display exitOnLastClose:true.
         ].
         "/ Processor exitWhenNoMoreUserProcesses:true.
-    ].            
+    ].
+    ^ display
+
+    "Modified: / 20-03-2018 / 12:43:29 / stefan"
 !
 
 mainStartup:graphicalMode
@@ -4183,33 +4186,36 @@
     (commandName, ' [info]: opening display...') infoPrintCR.
 
     Display isNil ifTrue:[
-	Screen notNil ifTrue:[
-	    [
-		Screen openDefaultDisplay:nil.
-	    ] on:Screen deviceOpenErrorSignal do:[:ex|
+        Screen notNil ifTrue:[
+            [
+                Screen openDefaultDisplay:nil.
+            ] on:Screen deviceOpenErrorSignal do:[:ex|
                 "do not use #errorPrintCR, it is no error, when an app supports display and no display.
                  in case shell exec 'app --version' we do not want this error string as part of the output"
                 ('%1 [error]: No display connection to: %2' bindWith:commandName with:ex parameter) infoPrintCR.
 "/                ('%1 [error]: No display connection to: %2' bindWith:commandName with:ex parameter) errorPrintCR.
-		(commandName, ' [info]: Either set the DISPLAY environment variable,') infoPrintCR.
-		(commandName, ' [info]: or start smalltalk with a -display argument.') infoPrintCR.
-		HeadlessOperation == true ifFalse:[
-		    OperatingSystem exit:1.
-		].
-	    ].
-
-	    Display notNil ifTrue:[
-		(self secureFileIn:'display.rc') ifFalse:[
-		    "/ 'Smalltalk [warning]: no display.rc found; screen setting might be wrong.' errorPrintCR.
-		    (self secureFileIn:'keyboard.rc') ifFalse:[
-			"/ 'Smalltalk [warning]: no keyboard.rc found; shortkey setting might be wrong.' errorPrintCR.
-		    ]
-		]
-	    ].
-	]
-    ]
+                (commandName, ' [info]: Either set the DISPLAY environment variable,') infoPrintCR.
+                (commandName, ' [info]: or start smalltalk with a -display argument.') infoPrintCR.
+                HeadlessOperation == true ifFalse:[
+                    OperatingSystem exit:1.
+                ].
+            ].
+
+            Display notNil ifTrue:[
+                (self secureFileIn:'display.rc') ifFalse:[
+                    "/ 'Smalltalk [warning]: no display.rc found; screen setting might be wrong.' errorPrintCR.
+                    (self secureFileIn:'keyboard.rc') ifFalse:[
+                        "/ 'Smalltalk [warning]: no keyboard.rc found; shortkey setting might be wrong.' errorPrintCR.
+                    ]
+                ]
+            ].
+        ]
+    ].
+
+    ^ Display
 
     "Created: / 06-12-2006 / 15:38:17 / cg"
+    "Modified: / 20-03-2018 / 12:39:55 / stefan"
 !
 
 providingDisplayDo:aBlock
@@ -8775,13 +8781,13 @@
     (lang == #de) ifTrue:[
         proto := 'Willkommen bei %1 (%4Version %2 von %3)'. bit := 'Bit'.
     ] ifFalse:[ (lang == #fr) ifTrue:[
-        proto := 'Salut, Bienvenue à %1 (%4version %2 de %3)'
+        proto := 'Salut, Bienvenue à %1 (%4version %2 de %3)'
     ] ifFalse:[ (lang == #it) ifTrue:[
         proto := 'Ciao, benvenuto al %1 (%4versione %2 di %3)'
     ] ifFalse:[ (lang == #es) ifTrue:[
         proto := 'Hola, bienvenida a %1 (%4version %2 de %3)'
     ] ifFalse:[ (lang == #pt) ifTrue:[
-        proto := 'Olá!!, mem-vindo a %1 (%4version %2 de %3)'
+        proto := 'Olá!!, mem-vindo a %1 (%4version %2 de %3)'
     ] ifFalse:[ (lang == #no) ifTrue:[
         proto := 'Hei, verdenmottakelse til %1 (%4versjon %2 av %3)'
     ]]]]]].