- Rationalized override preferences support, by remembering
  application resource fork RefNum and looking there only
- Added support for loading gusi prefs from Preferences file (needs
  modified GUSI, but Matthias promised he'd incorporate the fixes in
  the next release)
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index a85f88f..095673e 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -52,6 +52,7 @@
 extern int Py_DebugFlag; /* For parser.c, declared in pythonrun.c */
 extern int Py_VerboseFlag; /* For import.c, declared in pythonrun.c */
 extern int Py_SuppressPrintingFlag; /* For ceval.c, declared in pythonrun.c */
+short PyMac_AppRefNum;	/* RefNum of application resource fork */
 
 
 /* Subroutines that live in their own file */
@@ -97,7 +98,9 @@
 static void
 init_common()
 {
-
+	/* Remember resource fork refnum, for later */
+	PyMac_AppRefNum = CurResFile();
+	
 	/* Initialize toolboxes */
 	init_mac_world();
 	
@@ -110,6 +113,7 @@
 	/* Setup GUSI */
 	GUSIDefaultSetup();
 	PyMac_SetGUSISpin();
+	PyMac_SetGUSIOptions();
 #endif
 
 #ifdef USE_SIOUX