Merging appropriate 2.1.1 fixes back into the main trunk.

This commit is contained in:
Jack Jansen 2001-08-03 13:31:36 +00:00
parent cb60dae6a1
commit cbed91b4db
26 changed files with 162 additions and 122 deletions

View file

@ -227,7 +227,7 @@ char *PyMac_getscript()
case smCyrillic:
return "mac-cyrillic";
default:
return "mac-roman"; /* better than nothing */
return "ascii"; /* better than nothing */
}
}

View file

@ -486,6 +486,11 @@ PyMac_InitApplication()
PyMac_FixGUSIcd();
#endif
}
/* Check that the first argument is a text file */
if ( PyMac_getfiletype(argv[1]) != 'TEXT' ) {
Alert(NOTASCRIPT_ID, NULL);
exit(0);
}
}
Py_Main(argc, argv);
}