--- a/Launcher.st	Mon Jul 20 18:33:42 1998 +0200
+++ b/Launcher.st	Tue Jul 21 11:40:06 1998 +0200
@@ -4788,7 +4788,9 @@
     "restore settings from a settings-file."
 
     "a temporary kludge - we need a central systemSettings object for this,
-     which can be saved/restored with a single store/read."
+     which can be saved/restored with a single store/read.
+     Will move entries over to UserPreferences over time;
+     new items should always go there."
 
     |fileName resources|
 
@@ -4813,15 +4815,16 @@
         self reopenLauncher.
     ].
 
-    "Modified: 8.1.1997 / 14:53:52 / cg"
-
+    "Modified: / 21.7.1998 / 11:37:54 / cg"
 !
 
 saveSettingsFor:requestor
     "save settings to a settings-file."
 
     "a temporary kludge - we need a central systemSettings object for this,
-     which can be saved/restored with a single store/read."
+     which can be saved/restored with a single store/read.
+     Will move entries over to UserPreferences over time;
+     new items should always go there."
 
     |s screen fileName resources|
 
@@ -4952,6 +4955,7 @@
       nextPutLine:'MenuView showAcceleratorKeys: ' , (MenuView showAcceleratorKeys storeString) , '.';
       nextPutLine:'EditTextView st80Mode: ' , (EditTextView st80Mode storeString) , '.';
       nextPutLine:'UserPreferences current syntaxColoring: ' , (UserPreferences current syntaxColoring storeString) , '.';
+      nextPutLine:'UserPreferences current useNewInspector: ' , (UserPreferences current useNewInspector storeString) , '.';
       nextPutLine:'Class tryLocalSourceFirst: ' , (Class tryLocalSourceFirst storeString) , '.'.
     (Exception emergencyHandler == Launcher notifyingEmergencyHandler) ifTrue:[
         s nextPutLine:'Exception emergencyHandler:(Launcher notifyingEmergencyHandler).'.
@@ -5005,8 +5009,7 @@
      Transcript topView application saveSettings
     "
 
-    "Modified: / 1.4.1998 / 12:18:15 / cg"
-
+    "Modified: / 21.7.1998 / 11:37:44 / cg"
 !
 
 sourceAndDebuggerSettingsFor:requestor
@@ -5018,7 +5021,9 @@
      sourceCacheDir cacheEntry
      component localCheck oldIndent nm fn manager
      keepMethodHistory showErrorNotifier showVerboseStack
-     syntaxColoring resources useNewInspector pos|
+     syntaxColoring resources useNewInspector pos currentUserPrefs|
+
+    currentUserPrefs := UserPreferences current.
 
     resources := requestor class classResources.
 
@@ -5029,7 +5034,7 @@
     logDoits := Smalltalk logDoits asValue.
     updChanges := Class updatingChanges asValue.
     changeFileName := ObjectMemory nameForChanges asValue.
-    useNewInspector := UserPreferences current useNewInspector asValue.
+    useNewInspector := currentUserPrefs useNewInspector asValue.
 
     hasManager := AbstractSourceCodeManager notNil
                   and:[AbstractSourceCodeManager isLoaded].
@@ -5051,7 +5056,7 @@
     ].
     showErrorNotifier := (Exception emergencyHandler == Launcher notifyingEmergencyHandler) asValue.
     showVerboseStack := (DebugView defaultVerboseBacktrace ? false) asValue.
-    syntaxColoring := UserPreferences current syntaxColoring asValue.
+    syntaxColoring := currentUserPrefs syntaxColoring asValue.
 
     sourceCacheDir := nil asValue.
 
@@ -5204,8 +5209,8 @@
             Exception emergencyHandler:(Launcher notifyingEmergencyHandler)
         ].
         DebugView defaultVerboseBacktrace:(showVerboseStack value).
-        UserPreferences current syntaxColoring:syntaxColoring value.
-        UserPreferences current useNewInspector:useNewInspector value.
+        currentUserPrefs syntaxColoring:syntaxColoring value.
+        currentUserPrefs useNewInspector:useNewInspector value.
         useNewInspector value ifTrue:[
             Inspector := NewInspector::InspectorView
         ] ifFalse:[
@@ -5217,7 +5222,7 @@
     "Modified: / 9.9.1996 / 22:43:36 / stefan"
     "Created: / 17.1.1997 / 17:39:33 / cg"
     "Modified: / 16.4.1998 / 17:18:47 / ca"
-    "Modified: / 18.6.1998 / 18:43:25 / cg"
+    "Modified: / 21.7.1998 / 11:34:45 / cg"
 !
 
 viewStyleSettingsFor:requestor 
@@ -5554,5 +5559,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.354 1998-07-20 11:22:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.355 1998-07-21 09:40:06 cg Exp $'
 ! !