2000-01-29 06:56:35 +00:00
|
|
|
--- editor/coolpython.c.orig Thu Jan 27 22:59:34 2000
|
|
|
|
+++ editor/coolpython.c Thu Jan 27 23:00:34 2000
|
|
|
|
@@ -1487,7 +1487,7 @@
|
1999-06-09 00:05:23 +00:00
|
|
|
PyDict_SetItemString (d, "Mod3Mask", PyInt_FromLong ((long) Mod3Mask));
|
|
|
|
PyDict_SetItemString (d, "Mod4Mask", PyInt_FromLong ((long) Mod4Mask));
|
|
|
|
PyDict_SetItemString (d, "Mod5Mask", PyInt_FromLong ((long) Mod5Mask));
|
|
|
|
- PyDict_SetItemString (d, "LIBDIR", PyString_FromString (LIBDIR));
|
|
|
|
+ PyDict_SetItemString (d, "DATADIR", PyString_FromString (DATADIR));
|
|
|
|
|
2000-01-29 06:56:35 +00:00
|
|
|
PyDict_SetItemString (d, "Mod5Mask", PyInt_FromLong ((long) Mod5Mask));
|
|
|
|
|
|
|
|
@@ -1569,7 +1569,7 @@
|
1999-06-09 00:05:23 +00:00
|
|
|
import sys\n\
|
|
|
|
sys.path.append('%s')\n\
|
|
|
|
sys.path.append('%s%s')\n\
|
|
|
|
-", LIBDIR, home_dir, EDIT_DIR);
|
|
|
|
+", DATADIR, home_dir, EDIT_DIR);
|
|
|
|
e = PyRun_String (s, Py_file_input, name_space, name_space);
|
|
|
|
if (!e) {
|
|
|
|
PyErr_Print ();
|
2000-01-29 06:56:35 +00:00
|
|
|
@@ -1578,7 +1578,7 @@
|
1999-06-09 00:05:23 +00:00
|
|
|
}
|
|
|
|
Py_DECREF (e);
|
|
|
|
coolpython_constants (name_space);
|
|
|
|
- sprintf (s, "%s/%s", LIBDIR, GLOBAL_STARTUP_FILE);
|
|
|
|
+ sprintf (s, "%s/%s", DATADIR, GLOBAL_STARTUP_FILE);
|
|
|
|
coolpython_run_file (s);
|
|
|
|
sprintf (s, "%s%s/%s", home_dir, EDIT_DIR, GLOBAL_STARTUP_FILE);
|
|
|
|
if ((fd = open (s, O_RDONLY)) >= 0)
|