  if PLAT_WIN
  	position.left=0
 --- scite-latest/scite/src/SciTEProps.cxx	2009-08-06 23:46:52.000000000 +0000
-+++ scintillua/scite/src/SciTEProps.cxx	2010-01-07 02:35:09.000000000 +0000
++++ scintillua/scite/src/SciTEProps.cxx	2010-01-13 20:06:54.000000000 +0000
 @@ -538,50 +538,12 @@
  static const char *propertiesToForward[] = {
  //++Autogenerated -- run src/LexGen.py to regenerate

 
 //--Autogenerated -- end of automatically generated section
 
@@ -698,6 +660,7 @@
 	if (modulePath.length())
 	    SendEditorString(SCI_LOADLEXERLIBRARY, 0, modulePath.c_str());
 	language = props.GetNewExpand("lexer.", fileNameForExtension.c_str());
+#if 0 // added by Mitchell
 	if (language.length())
 	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, language.c_str());
 	else
@@ -719,6 +682,7 @@
 		SString kw = props.GetNewExpand(kwk.c_str(), fileNameForExtension.c_str());
 		SendEditorString(SCI_SETKEYWORDS, wl, kw.c_str());

 
 	FilePath homepath = GetSciteDefaultHome();
 	props.Set("SciteDefaultHome", homepath.AsFileSystem());
@@ -1197,12 +1161,13 @@
 }
 
 void SciTEBase::ReadFontProperties() {
-	char key[200];
+	// char key[200]; modified by Mitchell
 	SString sval;
 
 	// Set styles
 	// For each window set the global default style, then the language default style, then the other global styles, then the other language styles
 
+#if 0 // added by Mitchell
 	SendEditor(SCI_STYLERESETDEFAULT, 0, 0);
 	SendOutput(SCI_STYLERESETDEFAULT, 0, 0);
 
@@ -1230,6 +1195,23 @@
 
 	SetStyleFor(wOutput, "*");
 	SetStyleFor(wOutput, "errorlist");
+#endif // added by Mitchell
+
+	// added by Mitchell from ReadProperties()
+	SString fileNameForExtension = ExtensionFileName();
+
+	SString modulePath = props.GetNewExpand("lexerpath.",
+	    fileNameForExtension.c_str());
+	if (modulePath.length())
+	    SendEditorString(SCI_LOADLEXERLIBRARY, 0, modulePath.c_str());
+	language = props.GetNewExpand("lexer.", fileNameForExtension.c_str());
+	if (language.length())
+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, language.c_str());
+	else
+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, "container"); // modified by Mitchell
+
+	lexLanguage = SendEditor(SCI_GETLEXER);
+  // end added by Mitchell
 
 	if (CurrentBuffer()->useMonoFont) {
 		sval = props.GetExpanded("font.monospace");
