  
  OTHER_OBJS	= FilePath.o SciTEBuffers.o SciTEIO.o Exporters.o PropSetFile.o StringList.o \
  SciTEProps.o SciTEWin.o SciTEWinBar.o SciTEWinDlg.o MultiplexExtension.o \
-@@ -78,38 +95,38 @@
+@@ -78,38 +96,38 @@
  
  OBJS = SciTEBase.o $(OTHER_OBJS)
  

 				styler.Flush();
 			}
 		}
@@ -741,6 +795,55 @@
 		SetLexerLanguage(reinterpret_cast<const char *>(lParam));
 		break;
 
+	// added by Mitchell
+	case SCI_GETLEXERLANGUAGE: {
+			const char *val = lexLanguage == SCLEX_CONTAINER ? "container" : "null";
+			if (luaState) {
+				lua_getfield(luaState, LUA_REGISTRYINDEX, "languageName");
+				val = lua_tostring(luaState, -1); lua_pop(luaState, 1);
+			}
+			const int n = strlen(val);
+			if (lParam != 0) {
+				char *ptr = reinterpret_cast<char *>(lParam);
+				memcpy(ptr, val, n);
+				ptr[n] = '\0'; // terminate
+			}
+			return n;
+		}
+
+	case SCI_GETSTYLENAME: {
+			const char *val = "";
+			if (luaState) {

 	functionDefinition = 0;
 	indentOpening = true;
 	indentClosing = true;
+	indentMaintain = false;
 	statementLookback = 10;
+	preprocessorSymbol = '\0';
 
 	fnEditor = 0;
 	ptrEditor = 0;
@@ -369,6 +373,7 @@
 	tabMultiLine = false;
 	sbNum = 1;
 	visHeightTools = 0;
+	visHeightTab = 0;
 	visHeightStatus = 0;
 	visHeightEditor = 1;
 	heightBar = 7;
@@ -382,6 +387,7 @@
 	fullScreen = false;
 
 	heightOutput = 0;
+	heightOutputStartDrag = 0;
 	previousHeightOutput = 0;
 
 	allowMenuActions = true;
@@ -634,14 +640,14 @@
 		}
 #endif
 		AddStyledText(wsci, GetTranslationToAbout("Version").c_str(), trsSty);
-		AddStyledText(wsci, " 2.01\n", 1);
+		AddStyledText(wsci, " 2.02\n", 1);
 		AddStyledText(wsci, "    " __DATE__ " " __TIME__ "\n", 1);
 		SetAboutStyle(wsci, 2, ColourDesired(0, 0, 0));
 		Platform::SendScintilla(wsci, SCI_STYLESETITALIC, 2, 1);
 		AddStyledText(wsci, GetTranslationToAbout("by").c_str(), trsSty);
 		AddStyledText(wsci, " Neil Hodgson.\n", 2);
 		SetAboutStyle(wsci, 3, ColourDesired(0, 0, 0));
-		AddStyledText(wsci, "December 1998-August 2009.\n", 3);
+		AddStyledText(wsci, "December 1998-January 2010.\n", 3);
 		SetAboutStyle(wsci, 4, ColourDesired(0, 0x7f, 0x7f));
 		AddStyledText(wsci, "http://www.scintilla.org\n", 4);
 		AddStyledText(wsci, "Lua scripting language by TeCGraf, PUC-Rio\n", 3);
@@ -919,6 +925,11 @@
 	int maskStyle = (1 << SendEditor(SCI_GETSTYLEBITSNEEDED)) - 1;
 	bool isInside = false;
 	Window &win = editor ? wEditor : wOutput;
+
+	int mainSel = Platform::SendScintilla(win.GetID(), SCI_GETMAINSELECTION, 0, 0);
+	if (Platform::SendScintilla(win.GetID(), SCI_GETSELECTIONNCARETVIRTUALSPACE, mainSel, 0) > 0)
+		return false;
+
 	int bracesStyleCheck = editor ? bracesStyle : 0;
 	int caretPos = Platform::SendScintilla(win.GetID(), SCI_GETCURRENTPOS, 0, 0);
 	braceAtCaret = -1;
@@ -940,11 +951,13 @@
 		braceAtCaret = caretPos - 1;
 	}
 	bool colonMode = false;
