Change Set: From SciTE latest release revision (REL) to Bruce Dodson's local repository (LOCAL) 
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/LuaExtension.cxx LOCAL/scite/src/LuaExtension.cxx
--- REL/scite/src/LuaExtension.cxx	2006-06-26 20:39:25.000000000 -0300
+++ LOCAL/scite/src/LuaExtension.cxx	2006-06-26 20:40:41.000000000 -0300
@@ -22,6 +22,10 @@
 #include "lauxlib.h"
 }
 
+#if LUA_ENABLE_BITLIB
+extern "C" int luaopen_bit(lua_State *L);
+#endif
+
 #include "Platform.h"
 
 #if PLAT_WIN
@@ -191,10 +195,10 @@
 static void clear_table(lua_State *L, int tableIdx, bool clearMetatable = true) {
 	if (lua_istable(L, tableIdx)) {
 		tableIdx = absolute_index(L, tableIdx);
-	if (clearMetatable) {
-		lua_pushnil(L);
-		lua_setmetatable(L, tableIdx);
-	}
+		if (clearMetatable) {
+			lua_pushnil(L);
+			lua_setmetatable(L, tableIdx);
+		}
 		lua_pushnil(L); // first key
 		while (lua_next(L, tableIdx) != 0) {
 			// ‘key’ is at index -2 and ‘value’ at index -1
@@ -1368,6 +1372,10 @@
 	// loadlib might also work on Linux and some Unix variants, with some additional defines.
 	luaopen_loadlib(luaState);
 #endif
+#if LUA_ENABLE_BITLIB
+	// This one is not standard to Lua, but Scintilla uses a lot of bit flags so it makes sense.
+	luaopen_bit(luaState);
+#endif
 
 	lua_register(luaState, "_ALERT", cf_global_print);
 
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTE.properties LOCAL/scite/src/SciTE.properties
--- REL/scite/src/SciTE.properties	2005-08-08 09:22:23.000000000 -0300
+++ LOCAL/scite/src/SciTE.properties	2006-04-11 20:33:34.000000000 -0300
@@ -6,4 +6,8 @@
 command.build.*.h=nmake -f scite.mak DEBUG=1 QUIET=1
 command.go.*.cxx=..\bin\SciTE
 command.go.*.h=..\bin\SciTE
-command.go.needs.*.cxx=cmd /c cd ..\win32 && nmake -f scite.mak DEBUG=1 QUIET=1
\ No newline at end of file
+command.go.needs.*.cxx=cmd /c cd ..\win32 && nmake -f scite.mak DEBUG=1 QUIET=1
+
+tabsize=4
+indent.size=4
+use.tabs=1
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTEBase.cxx LOCAL/scite/src/SciTEBase.cxx
--- REL/scite/src/SciTEBase.cxx	2006-06-26 20:39:26.000000000 -0300
+++ LOCAL/scite/src/SciTEBase.cxx	2006-06-26 20:51:29.000000000 -0300
@@ -384,6 +384,8 @@
 	shortCutItemList = 0;
 	shortCutItems = 0;
 
+	startInMonospacedMode = false;
+
 	macrosEnabled = false;
 	recording = false;
 
@@ -569,6 +571,14 @@
 #endif
 		AddStyledText(wsci, GetTranslationToAbout("Version").c_str(), trsSty);
 		AddStyledText(wsci, " 1.70\n", 1);
+
+		Platform::SendScintilla(wsci, SCI_DELETEBACK); // delete newline
+		AddStyledText(wsci, "-wbd-1\n", 1);
+
+#if DEBUG
+		Platform::SendScintilla(wsci, SCI_DELETEBACK); // delete newline
+		AddStyledText(wsci, " (debug build)\n", 2);
+#endif
 		AddStyledText(wsci, "    " __DATE__ " " __TIME__ "\n", 1);
 		SetAboutStyle(wsci, 2, ColourDesired(0, 0, 0));
 		Platform::SendScintilla(wsci, SCI_STYLESETITALIC, 2, 1);
@@ -577,7 +587,9 @@
 		SetAboutStyle(wsci, 3, ColourDesired(0, 0, 0));
 		AddStyledText(wsci, "December 1998-June 2006.\n", 3);
 		SetAboutStyle(wsci, 4, ColourDesired(0, 0x7f, 0x7f));
-		AddStyledText(wsci, "http://www.scintilla.org\n", 4);
+		AddStyledText(wsci, "    http://www.scintilla.org\n", 4);
+		AddStyledText(wsci, "Compiled with modifications by Bruce Dodson\n", 3);
+		AddStyledText(wsci, "    http://gisdeveloper.tripod.com/scite.html\n", 4);
 		AddStyledText(wsci, "Lua scripting language by TeCGraf, PUC-Rio\n", 3);
 		AddStyledText(wsci, "    http://www.lua.org\n", 4);
 		if (translator.length()) {
@@ -3869,7 +3881,8 @@
 		break;
 
 	case IDM_MONOFONT:
-		CurrentBuffer()->useMonoFont = !CurrentBuffer()->useMonoFont;
+		CurrentBuffer()->useMonoFont = startInMonospacedMode = !CurrentBuffer()->useMonoFont;
+		//startInMonospacedMode is updated so that new buffers will use whichever mode the user chose last.
 		ReadFontProperties();
 		Redraw();
 		break;
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTEBase.h LOCAL/scite/src/SciTEBase.h
--- REL/scite/src/SciTEBase.h	2006-06-26 20:39:26.000000000 -0300
+++ LOCAL/scite/src/SciTEBase.h	2006-06-26 20:40:43.000000000 -0300
@@ -389,6 +389,8 @@
 	FilePath dirNameAtExecute;
 	FilePath dirNameForExecute;
 
+	bool startInMonospacedMode;
+
 	enum { fileStackMax = 10 };
 	RecentFile recentFileStack[fileStackMax];
 	enum { fileStackCmdID = IDM_MRUFILE, bufferCmdID = IDM_BUFFER };
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTEBuffers.cxx LOCAL/scite/src/SciTEBuffers.cxx
--- REL/scite/src/SciTEBuffers.cxx	2006-06-26 20:39:26.000000000 -0300
+++ LOCAL/scite/src/SciTEBuffers.cxx	2006-06-26 20:40:44.000000000 -0300
@@ -584,6 +584,7 @@
 	filePath.Set(curDirectory, "");
 	SetFileName(filePath);
 	CurrentBuffer()->isDirty = false;
+	CurrentBuffer()->useMonoFont = startInMonospacedMode;
 	isBuilding = false;
 	isBuilt = false;
 	isReadOnly = false;	// No sense to create an empty, read-only buffer...
@@ -602,6 +603,7 @@
 		// With no buffer list, Close means close from MRU
 		closingLast = !(recentFileStack[0].IsSet());
 		buffers.buffers[0].Init();
+		buffers.buffers[0].useMonoFont = startInMonospacedMode;
 		filePath.Set("");
 		ClearDocument(); //avoid double are-you-sure
 		if (!makingRoomForNew)
@@ -615,6 +617,7 @@
 		closingLast = (buffers.length == 1);
 		if (closingLast) {
 			buffers.buffers[0].Init();
+			buffers.buffers[0].useMonoFont = startInMonospacedMode;
 			if (extender)
 				extender->InitBuffer(0);
 		} else {
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTEGlobal.properties LOCAL/scite/src/SciTEGlobal.properties
--- REL/scite/src/SciTEGlobal.properties	2006-06-26 20:39:26.000000000 -0300
+++ LOCAL/scite/src/SciTEGlobal.properties	2006-06-26 21:00:36.000000000 -0300
@@ -5,6 +5,13 @@
 
 # Globals
 
+# Many of Bruce's customized settings (most of the ones that
+# affect the user interface) can be turned off by commenting
+# out this next line, or changing it to 0.
+#
+USE_CUSTOM_SETTINGS=1
+
+
 # Window sizes and visibility
 if PLAT_WIN
 	position.left=0
@@ -14,15 +21,20 @@
 	position.top=22
 position.width=576
 position.height=740
+if USE_CUSTOM_SETTINGS
+	position.width=600
+	position.height=660
 #position.tile=1
 #full.screen.hides.menu=1
 #minimize.to.tray=1
 split.vertical=1
+if USE_CUSTOM_SETTINGS
+	split.vertical=0
 #output.horizontal.size=200
 #output.vertical.size=60
 #output.initial.hide=1
 #horizontal.scrollbar=0
-#horizontal.scroll.width=10000
+horizontal.scroll.width=2200
 #output.horizontal.scrollbar=0
 #output.horizontal.scroll.width=10000
 #output.scroll=0
@@ -37,6 +49,12 @@
 #menubar.detachable=1
 #undo.redo.lazy=1
 #statusbar.visible=1
+if USE_CUSTOM_SETTINGS
+	tabbar.visible=1
+	tabbar.hide.one=1
+	tabbar.multiline=1
+	toolbar.visible=1
+	statusbar.visible=1
 #fileselector.width=800
 #fileselector.height=600
 #magnification=-1
@@ -46,6 +64,10 @@
 #line.margin.visible=1
 line.margin.width=4
 margin.width=16
+if USE_CUSTOM_SETTINGS
+	line.margin.visible=1
+	line.margin.width=3+
+	margin.width=0
 #fold.margin.width=16
 #fold.margin.colour=#FF0000
 #fold.margin.highlight.colour=#0000FF
@@ -60,6 +82,8 @@
 #control.char.symbol=.
 caret.period=500
 view.whitespace=0
+if USE_CUSTOM_SETTINGS
+	view.whitespace=1
 view.indentation.whitespace=1
 view.indentation.guides=1
 highlight.indentation.guides=1
@@ -78,6 +102,8 @@
 selection.alpha=30
 selection.back=#000000
 #whitespace.fore=#FF0000
+if USE_CUSTOM_SETTINGS
+	whitespace.fore=#E8E8E8
 #whitespace.back=#FFF0F0
 #error.marker.fore=#0000A0
 #error.marker.back=#DADAFF
@@ -95,19 +121,31 @@
 #save.on.deactivate=1
 #are.you.sure.on.reload=1
 #reload.preserves.undo=1
+if USE_CUSTOM_SETTINGS
+	load.on.activate=1
+	reload.preserves.undo=1
 #check.if.already.open=1
 default.file.ext=.cxx
+if USE_CUSTOM_SETTINGS
+	default.file.ext=.txt
 #title.full.path=1
 #title.show.buffers=1
+if USE_CUSTOM_SETTINGS
+	title.show.buffers=1
 #save.recent=1
 #save.session=1
 #open.dialog.in.file.directory=1
+if USE_CUSTOM_SETTINGS
+	open.dialog.in.file.directory=1
 #strip.trailing.spaces=1
 #ensure.final.line.end=1
 #ensure.consistent.line.ends=1
 #save.deletes.first=1
 buffers=10
 #buffers.zorder.switching=1
+if USE_CUSTOM_SETTINGS
+	buffers=30
+	buffers.zorder.switching=0
 #api.*.cxx=d:\api\w.api
 #win95.death.delay=1000
 #translation.missing=***
@@ -124,6 +162,12 @@
 indent.closing=0
 #tab.indents=0
 #backspace.unindents=0
+if USE_CUSTOM_SETTINGS
+	tabsize=4
+	indent.size=4
+	use.tabs=0
+	tab.indents=0
+	backspace.unindents=1
 
 # Wrapping of long lines
 #wrap=1
@@ -133,6 +177,13 @@
 #wrap.visual.flags=3
 #wrap.visual.flags.location=3
 #wrap.visual.startindent=4
+if USE_CUSTOM_SETTINGS
+	cache.layout=1
+	output.wrap=1
+	output.cache.layout=0
+	wrap.visual.flags=1
+	wrap.visual.flags.location=3
+	wrap.visual.startindent=0
 
 # Folding
 # enable folding, and show lines below when collapsed.
@@ -147,13 +198,26 @@
 # Find and Replace
 # Internal search always available with recursive capability so use in preference to external tool 
 find.command=
+
 # findstr is available on recent versions of Windows including 2000
-#if PLAT_WIN
-#	find.command=findstr /n /s $(find.what) $(find.files)
-#find.input=$(find.what)
-#if PLAT_GTK
-#	find.command=grep --line-number "$(find.what)" $(find.files)
-find.files=*.c *.cxx *.h
+# and is more flexible than the internal search
+if PLAT_WINNT
+	find.command=findstr /I /P /R /S /N /G:/ $(find.files)
+	find.input=$(find.what)
+
+if PLAT_WIN95
+	# If awk is available, this would work.  It's not recursive, and
+	# isn't smart like findstr about only processing text files, but
+	# behaves similarly to the grep command.
+	# But this is turned off now in favor of the internal search
+	#find.command=awk -v OFS=: -f - $(find.files)
+	#find.input=/$(find.what)/ { print FILENAME, FNR, $0; }
+	
+if PLAT_GTK
+	find.command=grep --line-number "$(find.what)" $(find.files)
+
+find.files=*.*|*.c *.cpp *.cxx *.h|*.bas *.cls *.frm *.dsr
+
 #find.in.files.close.on.find=0
 #find.replace.matchcase=1
 #find.replace.escapes=1
@@ -169,6 +233,9 @@
 clear.before.execute=0
 #vc.home.key=1
 #wrap.aware.home.end.keys=1
+if USE_CUSTOM_SETTINGS
+	vc.home.key=1
+	wrap.aware.home.end.keys=1
 #autocompleteword.automatic=1
 #autocomplete.choose.single=1
 caret.policy.xslop=1
@@ -188,15 +255,10 @@
 #caret.sticky=1
 
 # Status Bar
-statusbar.number=4
-statusbar.text.1=\
-li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr)
+statusbar.number=2
+statusbar.text.1= line $(LineNumber), column $(ColumnNumber) ($(OverType)) ($(EOLMode)) $(FileAttr) -  $(SelLength) chars selected
 statusbar.text.2=\
-$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars.
-statusbar.text.3=\
-Now is: Date=$(CurrentDate) Time=$(CurrentTime)
-statusbar.text.4=\
-$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr)
+ $(FileNameExt) (Total size: $(BufferLength) chars, $(NbOfLines) lines)
 
 if PLAT_WIN
 	command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
@@ -263,83 +325,117 @@
 if PLAT_GTK
 	all.files=All Files (*)|*|Hidden Files (.*)|.*|
 open.filter=\
-All Source|$(source.files)|\
+Source and Text Files|$(source.files);*.txt|\
 $(all.files)\
 $(filter.ada)\
 $(filter.conf)\
 $(filter.asm)\
 $(filter.asn1)\
 $(filter.ave)\
-$(filter.baan)\
+#$(filter.baan)\
 $(filter.bash)\
 $(filter.caml)\
 $(filter.cpp)\
 #$(filter.ch)\
 $(filter.css)\
 $(filter.eiffel)\
-$(filter.erlang)\
+#$(filter.erlang)\
 $(filter.fortran)\
 $(filter.idl)\
 $(filter.inno)\
 $(filter.java)\
 $(filter.js)\
-$(filter.kix)\
-$(filter.lout)\
+#$(filter.kix)\
+#$(filter.lout)\
 $(filter.lua)\
-$(filter.matlab)\
-$(filter.metapost)\
-$(filter.mmixal)\
-$(filter.nncrontab)\
-$(filter.nsis)\
-$(filter.opal)\
+#$(filter.matlab)\
+#$(filter.metapost)\
+#$(filter.mmixal)\
+#$(filter.nncrontab)\
+#$(filter.nsis)\
+#$(filter.opal)\
 $(filter.pascal)\
 $(filter.perl)\
 $(filter.php)\
-$(filter.pov)\
+#$(filter.pov)\
 $(filter.prg)\
 $(filter.properties)\
 $(filter.ps)\
 $(filter.python)\
 $(filter.ruby)\
 $(filter.sql)\
-$(filter.specman)\
+#$(filter.specman)\
 $(filter.tcl)\
 $(filter.tex)\
 $(filter.text)\
 $(filter.vb)\
-$(filter.web)\
-$(filter.yaml)\
-$(filter.verilog)\
-$(filter.vhdl)
+$(filter.web)
+#\
+#$(filter.yaml)\
+#$(filter.verilog)\
+#$(filter.vhdl)
 
 # Give symbolic names to the set of fonts used in the standard styles.
 if PLAT_WIN
-	font.base=font:Verdana,size:10
-	font.small=font:Verdana,size:8
-	font.comment=font:Comic Sans MS,size:9
+	font.lucida.mono=font:Lucida Console,size:9
+	font.lucida.sans=font:Lucida Sans Unicode,size:10
+
+	font.base=font:Lucida Sans Unicode,size:10
+	font.small=font:Lucida Sans Unicode,size:8
+	font.comment=font:Comic Sans MS,size:9,italics
 	font.code.comment.box=$(font.comment)
 	font.code.comment.line=$(font.comment)
 	font.code.comment.doc=$(font.comment)
-	font.text=font:Times New Roman,size:11
-	font.text.comment=font:Verdana,size:9
-	font.embedded.base=font:Verdana,size:9
-	font.embedded.comment=font:Comic Sans MS,size:8
-	font.monospace=font:Courier New,size:10
-	font.vbs=font:Lucida Sans Unicode,size:10
+	font.text=font:Arial,size:10
+	font.text.comment=font:Lucida Sans Unicode,size:10
+	font.embedded.base=font:Lucida Sans Unicode,size:10
+	font.embedded.comment=font:Comic Sans MS,size:8,italics
+	font.monospace=font:Lucida Console,size:9
+	font.vbs=font:Lucida Sans Unicode,size:9
+	font.js=font:Courier New,size:9
+
 if PLAT_GTK
-	font.base=font:!Bitstream Vera Sans,size:9
-	font.small=font:!Bitstream Vera Sans,size:8
-	font.comment=font:!Bitstream Vera Serif,size:9
+	font.lucida.mono=font:lucidatypewriter,size:12
+	font.lucida.sans=font:lucida,size:12
+
+	font.base=font:lucidatypewriter,size:12
+	font.small=font:lucidatypewriter,size:10
+	font.comment=font:new century schoolbook,size:12
 	font.code.comment.box=$(font.comment)
 	font.code.comment.line=$(font.comment)
 	font.code.comment.doc=$(font.comment)
-	font.text=font:!Bitstream Charter,size:10
-	font.text.comment=font:!Serif,size:9
-	font.embedded.base=font:!Serif,size:9
-	font.embedded.comment=font:!Serif,size:9
-	font.monospace=font:!Bitstream Vera Sans Mono,size:9
-	font.vbs=font:!Bitstream Vera Sans Mono,size:9
-font.js=$(font.comment)
+	font.text=font:times,size:14
+	font.text.comment=font:lucidatypewriter,size:10
+	font.embedded.base=font:lucidatypewriter,size:12
+	font.embedded.comment=font:lucidatypewriter,size:12
+	font.monospace=font:courier,size:12
+	font.vbs=font:new century schoolbook,size:12
+	font.js=font:courier,size:10
+
+# Custom monospaced font
+#
+# Lucida Console has a synthesized bold font which doesn't
+# quite match the spacing of the non-bold font (so isn't
+# exactly monospaced when keywords are involved).
+#
+# Nevertheless, I still like it better than Courier.
+
+if USE_CUSTOM_SETTINGS
+	font.monospace=$(font.lucida.mono)
+
+# When "Use Monospaced Font" is active, the font settings
+# from font.monospace are applied after the ones specified
+# on each individual style.
+
+# To start in monospaced mode, set the following property,
+# which is specific to the Bruce Dodson's SciTE.
+
+if USE_CUSTOM_SETTINGS
+	start.in.monospaced.mode=1
+
+
+
+
 
 # Old GTK+ font settings are faster but not antialiased
 	#~ font.base=font:lucidatypewriter,size:12
@@ -377,7 +473,7 @@
 # Default
 style.*.32=$(font.base)
 # Line number
-style.*.33=back:#C0C0C0,$(font.base)
+style.*.33=back:#C0C0C0,$(font.lucida.sans)
 # Brace highlight
 style.*.34=fore:#0000FF,bold
 # Brace incomplete highlight
@@ -386,6 +482,8 @@
 style.*.36=
 # Indentation guides
 style.*.37=fore:#C0C0C0,back:#FFFFFF
+if USE_CUSTOM_SETTINGS
+	style.*.37=fore:#DADADA,back:#FFFFFF
 
 # Printing - only works on Windows
 if PLAT_WIN
@@ -426,7 +524,7 @@
 #Apache Confi&g|conf||\
 Assembler|asm||\
 #ASN.1|asn1||\
-#Avenue|ave||\
+Avenue|ave||\
 #Baan|bc||\
 &Batch|bat||\
 #Bullant|ant||\
@@ -434,7 +532,7 @@
 C&#|cs||\
 #Csound|orc||\
 CSS|css||\
-&Difference|diff||\
+&Diff / Patch|diff||\
 #&Eiffel|e||\
 #Erlang|erl||\
 &Errorlist|err||\
@@ -450,7 +548,7 @@
 #Lot|lot||\
 #Lout|lt||\
 Lu&a|lua||\
-Matlab|m.matlab||\
+#Matlab|m.matlab||\
 &Makefile|mak|Ctrl+Shift+F11|\
 #MetaPost|mp||\
 #MMIXAL|mms||\
@@ -462,12 +560,12 @@
 Pascal|pas||\
 Pe&rl|pl||\
 P&HP|php||\
-#P&LSQL|spec||\
+P&L/SQL|spec||\
 &Properties|properties||\
-#P&ostScript|ps||\
+P&ostScript|ps||\
 #P&OV-Ray SDL|pov||\
 Pytho&n|py||\
-#Reso&urce|rc||\
+Reso&urce|rc||\
 Ruby|rb||\
 Shell|sh||\
 S&QL|sql||\
@@ -477,11 +575,13 @@
 VBScr&ipt|vbs||\
 #Verilog|v||\
 #VHDL|vhd||\
-&XML|xml|Shift+F12|\
-YAML|yaml||
+&XML|xml|Shift+F12|
+#\
+#YAML|yaml||
 
 # User defined key commands
 user.shortcuts=\
+Ctrl+F12|IDM_WRAP|\
 Ctrl+Shift+V|IDM_PASTEANDDOWN|\
 Ctrl+PageUp|IDM_PREVFILE|\
 Ctrl+PageDown|IDM_NEXTFILE|
@@ -495,7 +595,7 @@
 #import asn1
 #import au3
 import ave
-import baan
+#import baan
 #import freebasic
 #import blitzbasic
 #import bullant
@@ -505,8 +605,8 @@
 #import csound
 import css
 import eiffel
-import erlang
-import escript
+#import erlang
+#import escript
 #import flagship
 #import forth
 import fortran
@@ -514,23 +614,23 @@
 #import inno
 #import kix
 import lisp
-import lot
+#import lot
 #import lout
 import lua
-import matlab
-import metapost
-import mmixal
+#import matlab
+#import metapost
+#import mmixal
 #import nncrontab
 #import nsis
 #import opal
 import others
 import pascal
 import perl
-import pov
+#import pov
 import ps
 #import purebasic
 import python
-#import rebol
+import rebol
 import ruby
 #import scriptol
 #import smalltalk
@@ -538,9 +638,89 @@
 import sql
 #import specman
 import tcl
-import tex
+#import tex
 import vb
-import yaml
+#import yaml
 #import verilog
 #import vhdl
 
+
+# * Please read the following to get started with Lua Scripting.
+# These properties only work if you're using a Lua-enabled build
+# of SciTE.
+
+
+# The startup script is run to initialise SciTE.  This property
+# is checked, and the script run only run once - at startup time.
+# Afterward, whenever you switch buffers, Lua is restored to the
+# state established by this script.  Unless the ext.lua.reset
+# property is set, you need to restart SciTE in order to see
+# changes in this property or in the underlying script file.
+#
+ext.lua.startup.script=$(SciteDefaultHome)\SciTEStartup.lua
+
+
+# Normally, when the global state needs to be restored, this
+# is done without re-evaluating the startup script.  However,
+# if you are in the process of editing the startup script,
+# you may want to re-execute it without having to restart
+# SciTE.
+
+# ext.lua.auto.reload will immediately re-initialize the
+# global scope if the startup script or extension script
+# is saved from within SciTE.  This may have side effects.
+# However, it doesn't do anything unless you have been
+# editing the startup script, so I would just leave it on.
+#
+ext.lua.auto.reload=1
+
+# ext.lua.reset will cause the Lua global environment to be
+# cleared and reloaded whenever you switch buffers or open
+# a new file.  As such, it has a different set of side
+# effects than auto.reload.  In some situations it will make
+# sense for both auto.reload and reset to be enabled.
+#
+#ext.lua.reset=1
+
+
+# When errors occur in Lua, the error message is displayed 
+# using the _ALERT function.  (By default, _ALERT is an alias for
+# print.)  Error messages generally contain a descriptive message,
+# including the line and file where the error occurred.
+#
+# If debug.traceback is set to 1, this will cause SciTE to append
+# a trace of the call stack onto the error message.  It does this
+# by calling the _TRACEBACK function.  (By default, _TRACEBACK is
+# an alias for debug.traceback.)
+#
+#ext.lua.debug.traceback=1
+
+
+# The extension script is used to set up the Lua environment
+# for a specific buffer in SciTE.  This property is optional,
+# and can be used to define different behavior for each file
+# type.  Furthermore, if a simple filename is used rather
+# than an absolute path, then SciTE will look for the file
+# in the local folder for the buffer (like SciTE.properties)
+# before falling back to $(SciTEDefaultHome).
+#
+#extension.*=SciTE.lua
+
+
+#This is the same as the next two together.
+#Probably comment out the others if you uncomment this.
+#command.name.31.*=Clean Document Whitespace
+#command.mode.31.*=subsystem:lua,savebefore:no,groupundo
+#command.shortcut.31.*=Alt+Shift+I
+#command.31.*=cleanDocWhitespace
+
+command.name.31.*=Fix Indentation
+command.mode.31.*=subsystem:lua,savebefore:no,groupundo
+command.shortcut.31.*=Alt+Shift+I
+command.31.*=fixIndentation
+
+command.name.32.*=Strip Trailing Spaces
+command.mode.32.*=subsystem:lua,savebefore:no,groupundo
+command.shortcut.32.*=Alt+Shift+S
+command.32.*=stripTrailingSpaces
+
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTEProps.cxx LOCAL/scite/src/SciTEProps.cxx
--- REL/scite/src/SciTEProps.cxx	2006-06-26 20:39:27.000000000 -0300
+++ LOCAL/scite/src/SciTEProps.cxx	2006-06-26 20:40:45.000000000 -0300
@@ -1387,6 +1387,10 @@
 	SendEditor(SCI_SETWRAPMODE, wrap ? wrapStyle : SC_WRAP_NONE);
 	SendOutput(SCI_SETWRAPMODE, wrapOutput ? wrapStyle : SC_WRAP_NONE);
 
+	// This works assuming that this code gets executed after the initial
+	// buffer is allocated - which it does.  (Called from ReadProperties.)
+	CurrentBuffer()->useMonoFont = startInMonospacedMode = props.GetInt("start.in.monospaced.mode");
+
 	SString menuLanguageProp = props.GetNewExpand("menu.language");
 	languageItems = 0;
 	for (unsigned int i = 0; i < menuLanguageProp.length(); i++) {
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/SciTEStartup.lua LOCAL/scite/src/SciTEStartup.lua
--- REL/scite/src/SciTEStartup.lua	1969-12-31 20:00:00.000000000 -0400
+++ LOCAL/scite/src/SciTEStartup.lua	2004-10-31 18:28:06.000000000 -0400
@@ -0,0 +1,58 @@
+
+function stripTrailingSpaces(reportNoMatch)
+	local count = 0
+	local fs,fe = editor:findtext("[ \\t]+$", SCFIND_REGEXP)
+	if fe then
+		repeat
+			count = count + 1
+			editor:remove(fs,fe)
+			fs,fe = editor:findtext("[ \\t]+$", SCFIND_REGEXP, fs)
+		until not fe
+		print("Removed trailing spaces from " .. count .. " line(s).")
+	elseif reportNoMatch then
+		print("Document was clean already; nothing to do.")
+	end
+	return count
+end
+
+function fixIndentation(reportNoMatch)
+	local tabWidth = editor.TabWidth
+	local count = 0
+	if editor.UseTabs then
+		-- for each piece of indentation that includes at least one space
+		for m in editor:match("^[\\t ]* [\\t ]*", SCFIND_REGEXP) do
+			-- figure out the indentation size
+			local indentSize = editor.LineIndentation[editor:LineFromPosition(m.pos)]
+			local spaceCount = math.mod(indentSize, tabWidth)
+			local tabCount = (indentSize - spaceCount) / tabWidth
+			local fixedIndentation = string.rep('\t', tabCount) .. string.rep(' ', spaceCount)
+
+			if fixedIndentation ~= m.text then
+				m:replace(fixedIndentation)
+				count = count + 1
+			end
+		end
+	else
+		-- for each piece of indentation that includes at least one tab
+		for m in editor:match("^[\\t ]*\t[\\t ]*", SCFIND_REGEXP) do
+			-- just change all of the indentation to spaces
+			m:replace(string.rep(' ', editor.LineIndentation[editor:LineFromPosition(m.pos)]))
+			count = count + 1
+		end
+	end
+	if count > 0 then
+		print("Fixed indentation for " .. count .. " line(s).")
+	elseif reportNoMatch then
+		print("Document was clean already; nothing to do.")
+	end
+	return count
+end
+
+function cleanDocWhitespace()
+	local trailingSpacesCount = stripTrailingSpaces(false)
+	local fixedIndentationCount = fixIndentation(false)
+
+	if (fixedIndentationCount == 0) and (trailingSpacesCount == 0) then
+		print("Document was clean already; nothing to do.")
+	end
+end
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/ave.properties LOCAL/scite/src/ave.properties
--- REL/scite/src/ave.properties	2002-12-21 19:06:54.000000000 -0400
+++ LOCAL/scite/src/ave.properties	2004-10-29 22:52:57.000000000 -0300
@@ -25,13 +25,16 @@
 statement.lookback.$(file.patterns.ave)=1 end
 
 #Avenue string not support tab symbol, if You use tabs in script all tabs automatic translated to space.
-#use.tabs=0
+indent.size.$(file.patterns.ave)=2
+use.tabs.$(file.patterns.ave)=0
 
 ####################################################
 #Load user-defined api for current project.
 #api.$(file.patterns.ave)=ave.api
 ####################################################
 
+comment.ave='
+
 comment.block.ave='--
 
 comment.box.start.ave='--
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/cpp.properties LOCAL/scite/src/cpp.properties
--- REL/scite/src/cpp.properties	2006-06-26 20:39:27.000000000 -0300
+++ LOCAL/scite/src/cpp.properties	2006-06-26 20:40:45.000000000 -0300
@@ -69,7 +69,7 @@
 comment.box.start.cpp=/*
 comment.box.middle.cpp= *
 comment.box.end.cpp= */
-#fold.at.else=1
+fold.at.else=1
 
 statement.indent.$(file.patterns.c.like)=5 case catch class default do else finally \
 for if private protected public struct try union while
@@ -323,6 +323,18 @@
 command.build.*.java=javac *.java
 command.go.*.java=java $(FileName)
 
+
+api.$(file.patterns.cpp)=$(SciteDefaultHome)\cpp.api
+
+word.characters.*.java=$(word.chars.cxx)
+import java_kwd
+
+#Removed Java API until there's a side-effect-free fix for 
+#the problem with . in api file entries.
+
+#api.*.java=$(SciteDefaultHome)\java.api
+
+
 command.compile.*.ch=ch -n $(FileNameExt)
 command.build.*.ch=ch -n  $(FileNameExt)
 command.go.*.ch=ch -u $(FileNameExt)
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/html.properties LOCAL/scite/src/html.properties
--- REL/scite/src/html.properties	2006-04-11 20:36:05.000000000 -0300
+++ LOCAL/scite/src/html.properties	2006-04-11 20:27:45.000000000 -0300
@@ -23,6 +23,7 @@
 
 #Default Language=1 for JS, 2 for VBS.
 #asp.default.language=2
+asp.default.language=2
 #html.tags.case.sensitive=1
 
 #xml.auto.close.tags=1
@@ -518,3 +519,17 @@
 
 command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
 command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
+
+api.$(file.patterns.php)=$(SciteDefaultHome)\php.api
+
+command.name.1.$(file.patterns.xml)=Save and Indent XML
+command.1.$(file.patterns.xml)=tidy -xml -indent -modify "$(FilePath)"
+command.is.filter.1.$(file.patterns.xml)=1
+command.save.before.1.$(file.patterns.xml)=1
+
+if PLAT_WIN
+	command.go.*.xml=start "file://$(FilePath)"
+
+# WBD - for website maintenance - batteries not included.
+command.compile.*.htd=perl gen.pl "$(FileNameExt)"
+command.build.*.htd=perl gen.pl
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/lua.properties LOCAL/scite/src/lua.properties
--- REL/scite/src/lua.properties	2006-04-11 20:36:05.000000000 -0300
+++ LOCAL/scite/src/lua.properties	2006-04-11 20:27:46.000000000 -0300
@@ -77,9 +77,9 @@
 # in another property to highlight them in a warning/error style.
 # If you still use both, you can keep them like below, or use separate styles.
 
-keywords2.$(file.patterns.lua)=$(keywordclass2.lua) $(keywordclass2.lua4) $(keywordclass2.lua5)
-keywords3.$(file.patterns.lua)=$(keywordclass3.lua4) $(keywordclass3.lua5)
-keywords4.$(file.patterns.lua)=$(keywordclass4.lua4) $(keywordclass4.lua5)
+keywords2.$(file.patterns.lua)=$(keywordclass2.lua) $(keywordclass2.lua5)
+keywords3.$(file.patterns.lua)=$(keywordclass3.lua5)
+keywords4.$(file.patterns.lua)=$(keywordclass4.lua5)
 
 #~ statement.indent.$(file.patterns.lua)=5 do else function then
 #~ statement.end.$(file.patterns.lua)=5 end until
@@ -89,6 +89,13 @@
 comment.block.lua=--~
 comment.block.at.line.start.lua=1
 
+comment.stream.start.lua=--[[
+comment.stream.end.lua=--]]
+
+comment.box.start.lua=--[[
+comment.box.middle.lua=  --
+comment.box.end.lua=--]]
+
 # Lua styles
 
 #Default
@@ -130,8 +137,11 @@
 # Braces are only matched in operator style
 braces.lua.style=10
 
-command.compile.*.lua=LuaC-5.0.exe -o "$(FileName).luc" "$(FileNameExt)"
-# Lua 5.0
-command.go.*.lua=Lua-5.0.exe "$(FileNameExt)"
-# Lua 4.0
-#command.go.*.lua=Lua-4.0.exe -c -f "$(FileNameExt)"
+api.$(file.patterns.lua)=$(SciteDefaultHome)\lualib5_annot_scite.api
+calltip.lua.word.characters=.$(word.chars.lua)
+calltip.lua.end.definition=)
+
+#command.compile.*.lua=luac -o "$(FileName).luc" "$(FileNameExt)"
+#command.go.*.lua=lua -c -f "$(FileNameExt)"
+command.go.*.lua=dofile $(FileNameExt)
+command.go.subsystem.*.lua=3
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/others.properties LOCAL/scite/src/others.properties
--- REL/scite/src/others.properties	2006-04-11 20:36:06.000000000 -0300
+++ LOCAL/scite/src/others.properties	2006-04-11 20:27:46.000000000 -0300
@@ -1,9 +1,9 @@
 # Define SciTE settings for other simple files.
 
-file.patterns.props=*.properties;*.ini;*.inf;*.reg;*.url;*.cfg;*.cnf;*.aut
+file.patterns.props=*.properties;*.ini;*.inf;*.reg;*.url;*.cfg;*.cnf;*.aut;*.iss
 file.patterns.text=*.txt;*.log;*.lst;*.doc;*.diz;*.nfo
 file.patterns.batch=*.bat;*.cmd;*.nt
-file.patterns.diff=*.diff;*.patch
+file.patterns.diff=*.diff;*.patch;*.rej
 file.patterns.make=makefile;Makefile;*.mak;configure*
 
 filter.properties=Properties (ini inf reg url cfg cnf)|$(file.patterns.props)|
@@ -18,6 +18,10 @@
 lexer.*.iface=makefile
 lexer.$(file.patterns.diff)=diff
 
+use.tabs.$(file.patterns.make)=1
+tab.size.$(file.patterns.make)=8
+indent.size.$(file.patterns.make)=8
+
 word.characters.$(file.patterns.text)=$(chars.alpha)$(chars.numeric)$(chars.accented)-'
 
 colour.other.operator=fore:#B06000
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/perl.properties LOCAL/scite/src/perl.properties
--- REL/scite/src/perl.properties	2006-04-11 20:36:06.000000000 -0300
+++ LOCAL/scite/src/perl.properties	2006-04-11 20:27:46.000000000 -0300
@@ -207,3 +207,4 @@
 
 command.name.3.$(file.patterns.perl)=Profiler Parser
 command.3.$(file.patterns.perl)=C:\Perl\bin\dprofpp.bat $(FileDir)\tmon.out
+api.$(file.patterns.perl)=$(SciteDefaultHome)\perl.api
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/src/python.properties LOCAL/scite/src/python.properties
--- REL/scite/src/python.properties	2006-06-26 20:39:29.000000000 -0300
+++ LOCAL/scite/src/python.properties	2006-06-26 20:40:46.000000000 -0300
@@ -69,8 +69,8 @@
 braces.python.style=10
 
 if PLAT_WIN
-	command.go.*.py=pythonw -u "$(FileNameExt)"
-	command.go.subsystem.*.py=1
+	command.go.*.py=python -u "$(FileNameExt)"
+	command.go.subsystem.*.py=0
 	command.go.*.pyw=pythonw -u "$(FileNameExt)"
 	command.go.subsystem.*.pyw=1
 	command.build.SConscript=scons.bat --up .
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/win32/SciTERes.rc LOCAL/scite/win32/SciTERes.rc
--- REL/scite/win32/SciTERes.rc	2006-06-26 20:39:30.000000000 -0300
+++ LOCAL/scite/win32/SciTERes.rc	2006-06-26 21:01:06.000000000 -0300
@@ -579,7 +579,7 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	1, 7, 0, 0
+FILEVERSION	1, 7, 0, 101
 PRODUCTVERSION	1, 7, 0, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
@@ -597,7 +597,7 @@
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"SciTE - a Scintilla based Text Editor\0"
-			VALUE	"FileVersion",	"1.70\0"
+			VALUE	"FileVersion",	"1.70-wbd-1\0"
 			VALUE	"InternalName",	"SciTE\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2006 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"SciTE.EXE\0"
Binary files REL/scite/win32/closefile.bmp and LOCAL/scite/win32/closefile.bmp differ
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/win32/deps.mak LOCAL/scite/win32/deps.mak
--- REL/scite/win32/deps.mak	2006-04-11 20:36:09.000000000 -0300
+++ LOCAL/scite/win32/deps.mak	2006-04-11 20:34:17.000000000 -0300
@@ -2,30 +2,28 @@
   ../../scintilla/include/Platform.h ../../scintilla/include/PropSet.h \
   ../../scintilla/include/SString.h ../../scintilla/include/Scintilla.h \
   ../../scintilla/include/Accessor.h ../src/Extender.h \
-  ../../scintilla/include/Scintilla.h DirectorExtension.h ../src/SciTE.h \
-  ../src/FilePath.h ../src/PropSetFile.h ../src/SciTEBase.h
+  DirectorExtension.h ../src/SciTE.h ../src/FilePath.h \
+  ../src/PropSetFile.h ../src/SciTEBase.h
 SciTEWin.o: SciTEWin.cxx SciTEWin.h ../../scintilla/include/Platform.h \
   ../src/SciTE.h ../../scintilla/include/PropSet.h \
   ../../scintilla/include/SString.h ../../scintilla/include/Accessor.h \
   ../../scintilla/include/KeyWords.h ../../scintilla/include/Scintilla.h \
-  ../src/Extender.h ../../scintilla/include/Scintilla.h ../src/FilePath.h \
-  ../src/PropSetFile.h ../src/SciTEBase.h ../src/SciTEKeys.h \
-  UniqueInstance.h ../src/MultiplexExtension.h ../src/Extender.h \
-  DirectorExtension.h SingleThreadExtension.h ../src/LuaExtension.h
+  ../src/Extender.h ../src/FilePath.h ../src/PropSetFile.h \
+  ../src/SciTEBase.h ../src/SciTEKeys.h UniqueInstance.h \
+  ../src/MultiplexExtension.h DirectorExtension.h SingleThreadExtension.h \
+  ../src/LuaExtension.h
 SciTEWinBar.o: SciTEWinBar.cxx SciTEWin.h \
   ../../scintilla/include/Platform.h ../src/SciTE.h \
   ../../scintilla/include/PropSet.h ../../scintilla/include/SString.h \
   ../../scintilla/include/Accessor.h ../../scintilla/include/KeyWords.h \
-  ../../scintilla/include/Scintilla.h ../src/Extender.h \
-  ../../scintilla/include/Scintilla.h ../src/FilePath.h \
+  ../../scintilla/include/Scintilla.h ../src/Extender.h ../src/FilePath.h \
   ../src/PropSetFile.h ../src/SciTEBase.h ../src/SciTEKeys.h \
   UniqueInstance.h
 SciTEWinDlg.o: SciTEWinDlg.cxx SciTEWin.h \
   ../../scintilla/include/Platform.h ../src/SciTE.h \
   ../../scintilla/include/PropSet.h ../../scintilla/include/SString.h \
   ../../scintilla/include/Accessor.h ../../scintilla/include/KeyWords.h \
-  ../../scintilla/include/Scintilla.h ../src/Extender.h \
-  ../../scintilla/include/Scintilla.h ../src/FilePath.h \
+  ../../scintilla/include/Scintilla.h ../src/Extender.h ../src/FilePath.h \
   ../src/PropSetFile.h ../src/SciTEBase.h ../src/SciTEKeys.h \
   UniqueInstance.h
 SingleThreadExtension.o: SingleThreadExtension.cxx \
@@ -35,9 +33,16 @@
   SciTEWin.h ../src/SciTE.h ../../scintilla/include/PropSet.h \
   ../../scintilla/include/SString.h ../../scintilla/include/Accessor.h \
   ../../scintilla/include/KeyWords.h ../../scintilla/include/Scintilla.h \
-  ../src/Extender.h ../../scintilla/include/Scintilla.h ../src/FilePath.h \
-  ../src/PropSetFile.h ../src/SciTEBase.h ../src/SciTEKeys.h \
-  UniqueInstance.h
+  ../src/Extender.h ../src/FilePath.h ../src/PropSetFile.h \
+  ../src/SciTEBase.h ../src/SciTEKeys.h UniqueInstance.h
+Copy\ of\ SciTEBuffers.o: ../src/Copy\ of\ SciTEBuffers.cxx \
+  ../../scintilla/include/Platform.h ../src/SciTE.h \
+  ../../scintilla/include/PropSet.h ../../scintilla/include/SString.h \
+  ../../scintilla/include/Accessor.h \
+  ../../scintilla/include/WindowAccessor.h \
+  ../../scintilla/include/KeyWords.h ../../scintilla/include/Scintilla.h \
+  ../../scintilla/include/SciLexer.h ../src/Extender.h ../src/FilePath.h \
+  ../src/PropSetFile.h ../src/SciTEBase.h
 Exporters.o: ../src/Exporters.cxx ../../scintilla/include/Platform.h \
   ../src/SciTE.h ../../scintilla/include/PropSet.h \
   ../../scintilla/include/SString.h ../../scintilla/include/Accessor.h \
@@ -53,8 +58,7 @@
   ../src/Extender.h ../src/LuaExtension.h \
   ../../scintilla/include/SString.h ../src/SciTEKeys.h \
   ../src/IFaceTable.h ../lua/include/lua.h ../lua/include/lualib.h \
-  ../lua/include/lua.h ../lua/include/lauxlib.h \
-  ../../scintilla/include/Platform.h
+  ../lua/include/lauxlib.h ../../scintilla/include/Platform.h
 MultiplexExtension.o: ../src/MultiplexExtension.cxx \
   ../src/MultiplexExtension.h ../src/Extender.h \
   ../../scintilla/include/Scintilla.h
@@ -155,10 +159,10 @@
   ../lua/src/lmem.h ../lua/src/ltable.h
 ltests.o: ../lua/src/ltests.c ../lua/include/lua.h ../lua/src/lapi.h \
   ../lua/src/lobject.h ../lua/src/llimits.h ../lua/include/lauxlib.h \
-  ../lua/include/lua.h ../lua/src/lcode.h ../lua/src/llex.h \
-  ../lua/src/lzio.h ../lua/src/lopcodes.h ../lua/src/lparser.h \
-  ../lua/src/ltable.h ../lua/src/ldebug.h ../lua/src/lstate.h \
-  ../lua/src/ltm.h ../lua/src/ldo.h ../lua/src/lfunc.h ../lua/src/lmem.h \
+  ../lua/src/lcode.h ../lua/src/llex.h ../lua/src/lzio.h \
+  ../lua/src/lopcodes.h ../lua/src/lparser.h ../lua/src/ltable.h \
+  ../lua/src/ldebug.h ../lua/src/lstate.h ../lua/src/ltm.h \
+  ../lua/src/ldo.h ../lua/src/lfunc.h ../lua/src/lmem.h \
   ../lua/src/lstring.h ../lua/include/lualib.h
 ltm.o: ../lua/src/ltm.c ../lua/include/lua.h ../lua/src/lobject.h \
   ../lua/src/llimits.h ../lua/src/lstate.h ../lua/src/ltm.h \
@@ -175,18 +179,20 @@
 lzio.o: ../lua/src/lzio.c ../lua/include/lua.h ../lua/src/llimits.h \
   ../lua/src/lmem.h ../lua/src/lzio.h
 lauxlib.o: ../lua/src/lib/lauxlib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h
+  ../lua/include/lauxlib.h
 lbaselib.o: ../lua/src/lib/lbaselib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
+lbitlib.o: ../lua/src/lib/lbitlib.c ../lua/include/lauxlib.h \
+  ../lua/include/lua.h
 ldblib.o: ../lua/src/lib/ldblib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
 liolib.o: ../lua/src/lib/liolib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
 lmathlib.o: ../lua/src/lib/lmathlib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
 loadlib.o: ../lua/src/lib/loadlib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
 lstrlib.o: ../lua/src/lib/lstrlib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
 ltablib.o: ../lua/src/lib/ltablib.c ../lua/include/lua.h \
-  ../lua/include/lauxlib.h ../lua/include/lua.h ../lua/include/lualib.h
+  ../lua/include/lauxlib.h ../lua/include/lualib.h
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/win32/makefile LOCAL/scite/win32/makefile
--- REL/scite/win32/makefile	2006-06-26 20:39:31.000000000 -0300
+++ LOCAL/scite/win32/makefile	2006-06-26 20:40:48.000000000 -0300
@@ -41,7 +41,7 @@
 		ltable.o ltests.o ltm.o lundump.o lvm.o lzio.o
 
 LUA_LIB_OBJS =	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o \
-		lstrlib.o loadlib.o
+		lstrlib.o loadlib.o lbitlib.o
 
 LUA_OBJS = LuaExtension.o IFaceTable.o SingleThreadExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
 
@@ -49,6 +49,8 @@
 
 LUA_INCLUDES = -I ../lua/include
 #LUA_SCRIPTS = ..\bin\SciTEExtension.lua ..\bin\SciTEStartup.lua
+
+LUA_DEFINES = -DLUA_ENABLE_BITLIB
 else
 LUA_DEFINES = -DNO_LUA
 endif
@@ -57,16 +59,19 @@
 RCINCLUDEDIRS=--include-dir ../../scintilla/win32 --include-dir ../src
 
 CBASEFLAGS = -W -Wall $(INCLUDEDIRS) $(LUA_DEFINES) -mno-cygwin
+CXXBASEFLAGS = $(CBASEFLAGS) -pedantic -fno-exceptions $(THUNKFLAGS) -fno-rtti
 
 ifdef DEBUG
-CFLAGS=-DDEBUG -g $(CBASEFLAGS)
+#Don't include symbol table for plain C files (i.e. Lua)
+#But do include it for the SciTE C++ objects.
+CFLAGS=-DDEBUG -ggdb $(CBASEFLAGS)
+CXXFLAGS=-DDEBUG -ggdb $(CXXBASEFLAGS)
 else
 CFLAGS=-DNDEBUG -Os $(CBASEFLAGS)
+CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
 STRIPFLAG="-Wl,-s"
 endif
 
-CXXFLAGS = $(CFLAGS) -pedantic -fno-exceptions $(THUNKFLAGS) -fno-rtti -mno-cygwin
-
 LDFLAGS=-mwindows -lcomctl32 -limm32 -lole32 -luuid $(LUA_LDFLAGS) -mno-cygwin
 
 .cxx.o:
@@ -112,8 +117,16 @@
 
 ALL:	$(PROG) $(PROGSTATIC) $(DLLS) $(PROPS) $(LUA_SCRIPTS)
 
+sc1: $(PROGSTATIC)
+
+embedded: ../src/Embedded.properties
+
+props: $(PROPS) $(LUA_SCRIPTS)
+
+scite: $(PROG) $(DLLS) $(PROPS) $(LUA_SCRIPTS)
+
 clean:
-	$(DEL) *.exe *.o *.obj *.dll *.res *.map
+	$(DEL) *.exe *.o *.dll *.res *.map
 
 deps:
 	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lua/src/*.c ../lua/src/lib/*.c >deps.mak
@@ -280,3 +293,6 @@
 # Make sure SciTEBase gets rebuilt (so its about box gets a new
 # date stamp) when any of the other objects are updated.
 SciTEBase.o: $(OTHER_OBJS)
+
+luatest.exe: ../luatest.c $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+	gcc $(CFLAGS) -g -o $@ ../luatest.c $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/win32/scite.mak LOCAL/scite/win32/scite.mak
--- REL/scite/win32/scite.mak	2006-06-26 20:39:31.000000000 -0300
+++ LOCAL/scite/win32/scite.mak	2006-06-26 20:40:49.000000000 -0300
@@ -43,8 +43,8 @@
 # Don't use "-MD", even with "-D_STATIC_CPPLIB" because it links to MSVCR71.DLL
 CXXNDEBUG=-O1 -Oi -MT -DNDEBUG -GL
 NAME=-Fo
-LDFLAGS=-OPT:NOWIN98 -OPT:REF -LTCG -DEBUG
-LDDEBUG=
+LDFLAGS=-OPT:NOWIN98 -OPT:REF -LTCG
+LDDEBUG=-DEBUG
 LIBS=KERNEL32.lib USER32.lib GDI32.lib COMDLG32.lib COMCTL32.lib ADVAPI32.lib IMM32.lib SHELL32.LIB OLE32.LIB
 NOLOGO=-nologo
 
@@ -249,13 +249,14 @@
 		ltable.obj ltests.obj ltm.obj lundump.obj lvm.obj lzio.obj
 
 LUA_LIB_OBJS =	lauxlib.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj ltablib.obj \
-                lstrlib.obj loadlib.obj
+                lstrlib.obj loadlib.obj lbitlib.obj
 
 LUA_OBJS = LuaExtension.obj IFaceTable.obj SingleThreadExtension.obj $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
 
 OBJS = $(OBJS) $(LUA_OBJS)
 OBJSSTATIC = $(OBJSSTATIC) $(LUA_OBJS)
 INCLUDEDIRS = $(INCLUDEDIRS) -I../lua/include
+CXXFLAGS=$(CXXFLAGS) -DLUA_ENABLE_BITLIB
 !ELSE
 CXXFLAGS=$(CXXFLAGS) -DNO_LUA
 !ENDIF
@@ -266,6 +267,12 @@
 
 ALL: $(PROG) $(PROGSTATIC) $(DLLS) $(PROPS)
 
+scite: $(PROG) $(DLLS) $(PROPS)
+
+sc1: $(PROGSTATIC)
+
+props: $(PROPS)
+
 clean:
 	del /q $(DIR_BIN)\*.exe *.o *.obj $(DIR_BIN)\*.dll *.res *.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.lib $(DIR_BIN)\*.pdb
 
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/doc/SciTEDoc.html LOCAL/scite/doc/SciTEDoc.html
--- REL/scite/doc/SciTEDoc.html	2006-06-26 20:39:19.000000000 -0300
+++ LOCAL/scite/doc/SciTEDoc.html	2006-06-26 20:40:35.000000000 -0300
@@ -2203,6 +2203,14 @@
            A * can be used instead of a lexer to indicate a global style setting.
         </td>
       </tr>
+      <tr>
+        <td>
+        start.in.monospaced.mode
+        </td>
+        <td>
+        If set to 1, start in Use Monospaced Font mode.
+        </td>
+       </tr>
        <tr>
         <td>
           braces.check<br />
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/doc/SciTEFAQ.html LOCAL/scite/doc/SciTEFAQ.html
--- REL/scite/doc/SciTEFAQ.html	2006-06-26 20:39:19.000000000 -0300
+++ LOCAL/scite/doc/SciTEFAQ.html	2006-06-26 20:40:36.000000000 -0300
@@ -92,9 +92,16 @@
     </h4>
     <p>
        The <code>use.monospaced</code> property was removed as
-       people were using it to ask for fixed width fonts and then
-       requiring support to cope with its limitations. The correct way to
-       set fixed width fonts is <a class="toc" href="#FixedWidth">here</a>.
+       people were using it to ask for fixed width fonts for
+       all text and then requiring support to cope with its
+       limitations. This was not what the <code>use.monospaced</code>
+       property was for; the correct way to set fixed width fonts
+       for all text is <a class="toc" href="#FixedWidth">here</a>.
+    </p><p>
+       However, the Use Monospaced Font menu option is still
+       there, and works as before.  If you want to have SciTE
+       start up in Use Monospaced Fonts mode, set the new
+       <code>start.in.monospaced.mode</code> property to 1.
     </p>
     <h4 id="LineNumbers">
        Why doesn't my <code>line.numbers</code> setting work?
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/src/CellBuffer.cxx LOCAL/scintilla/src/CellBuffer.cxx
--- REL/scintilla/src/CellBuffer.cxx	2005-12-11 19:43:02.000000000 -0400
+++ LOCAL/scintilla/src/CellBuffer.cxx	2005-12-17 20:23:51.000000000 -0400
@@ -518,14 +518,16 @@
 
 void UndoHistory::EndUndoAction() {
 	EnsureUndoRoom();
-	undoSequenceDepth--;
-	if (0 == undoSequenceDepth) {
-		if (actions[currentAction].at != startAction) {
-			currentAction++;
-			actions[currentAction].Create(startAction);
-			maxAction = currentAction;
+	if (undoSequenceDepth != 0) {
+		undoSequenceDepth--;
+		if (0 == undoSequenceDepth) {
+			if (actions[currentAction].at != startAction) {
+				currentAction++;
+				actions[currentAction].Create(startAction);
+				maxAction = currentAction;
+			}
+			actions[currentAction].mayCoalesce = false;
 		}
-		actions[currentAction].mayCoalesce = false;
 	}
 }
 
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/src/SciTE.properties LOCAL/scintilla/src/SciTE.properties
--- REL/scintilla/src/SciTE.properties	2003-12-13 23:21:37.000000000 -0400
+++ LOCAL/scintilla/src/SciTE.properties	2004-10-29 22:49:18.000000000 -0300
@@ -4,3 +4,7 @@
 command.build.directory.*.h=..\win32
 command.build.*.cxx=nmake -f scintilla.mak QUIET=1 DEBUG=1
 command.build.*.h=nmake -f scintilla.mak QUIET=1 DEBUG=1
+
+tabsize=4
+indent.size=4
+use.tabs=1
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/win32/SciTE.properties LOCAL/scintilla/win32/SciTE.properties
--- REL/scintilla/win32/SciTE.properties	2004-04-27 19:13:00.000000000 -0300
+++ LOCAL/scintilla/win32/SciTE.properties	2004-10-29 22:51:25.000000000 -0300
@@ -19,3 +19,8 @@
 command.build.*.cxx=nmake -f scintilla.mak DEBUG=1 QUIET=1
 command.build.*.h=nmake -f scintilla.mak DEBUG=1 QUIET=1
 command.build.*.rc=nmake -f scintilla.mak DEBUG=1 QUIET=1
+
+
+tabsize=4
+indent.size=4
+use.tabs=1
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/win32/ScintRes.rc LOCAL/scintilla/win32/ScintRes.rc
--- REL/scintilla/win32/ScintRes.rc	2006-06-26 20:39:11.000000000 -0300
+++ LOCAL/scintilla/win32/ScintRes.rc	2006-06-26 20:41:15.000000000 -0300
@@ -9,7 +9,7 @@
 #include "PlatformRes.h"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	1, 7, 0, 0
+FILEVERSION	1, 7, 0, 101
 PRODUCTVERSION	1, 7, 0, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
@@ -27,7 +27,7 @@
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
-			VALUE	"FileVersion",	"1.70\0"
+			VALUE	"FileVersion",	"1.70-wbd-1\0"
 			VALUE	"InternalName",	"Scintilla\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2006 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/win32/deps.mak LOCAL/scintilla/win32/deps.mak
--- REL/scintilla/win32/deps.mak	2006-04-11 20:35:50.000000000 -0300
+++ LOCAL/scintilla/win32/deps.mak	2006-04-11 20:27:09.000000000 -0300
@@ -15,6 +15,10 @@
 CharClassify.o: ../src/CharClassify.cxx ../src/CharClassify.h
 ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \
   ../src/ContractionState.h
+Copy\ of\ LexAVE.o: ../src/Copy\ of\ LexAVE.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 Document.o: ../src/Document.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \
  ../src/CharClassify.h  ../src/Document.h ../src/RESearch.h
@@ -46,6 +50,9 @@
 LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -58,9 +65,16 @@
 LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h
+LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -73,6 +87,10 @@
 LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -88,6 +106,10 @@
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexForth.o: ../src/LexForth.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -99,6 +121,10 @@
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -107,7 +133,7 @@
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
-  ../include/Scintilla.h ../include/SciLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
 LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -158,19 +184,31 @@
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
+  ../src/StyleContext.h
 LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h
 LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
 LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \
-  ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
-  ../include/Scintilla.h ../include/SciLexer.h
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
@@ -181,6 +219,9 @@
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/win32/makefile LOCAL/scintilla/win32/makefile
--- REL/scintilla/win32/makefile	2006-06-26 20:39:11.000000000 -0300
+++ LOCAL/scintilla/win32/makefile	2006-06-26 20:40:15.000000000 -0300
@@ -29,12 +29,12 @@
 # Add -MMD to get dependencies
 #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti
 INCLUDEDIRS=-I ../include -I ../src
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti -mno-cygwin
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -fno-exceptions $(THUNKFLAGS) -fno-rtti -mno-cygwin
 
 ifdef DEBUG
-CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
+CXXFLAGS=-DDEBUG -ggdb $(CXXBASEFLAGS)
 else
-CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
+CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
 endif
 
 .cxx.o:
@@ -81,6 +81,8 @@
 	$(AR) rc $@ $^
 	ranlib $@
 
+objects: $(SOBJS) $(LOBJS) ScintillaWinS.o WindowAccessor.o
+
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak
 
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scintilla/win32/scintilla.mak LOCAL/scintilla/win32/scintilla.mak
--- REL/scintilla/win32/scintilla.mak	2006-06-26 20:39:11.000000000 -0300
+++ LOCAL/scintilla/win32/scintilla.mak	2006-06-26 20:40:15.000000000 -0300
@@ -40,8 +40,8 @@
 CXXDEBUG=-Od -MTd -DDEBUG
 CXXNDEBUG=-O1 -MT -DNDEBUG -GL
 NAME=-Fo
-LDFLAGS=-OPT:NOWIN98 -OPT:REF -LTCG -DEBUG
-LDDEBUG=
+LDFLAGS=-OPT:NOWIN98 -OPT:REF -LTCG
+LDDEBUG=-DEBUG
 LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB
 NOLOGO=-nologo
 
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/lua/src/lib/lbitlib.c LOCAL/scite/lua/src/lib/lbitlib.c
--- REL/scite/lua/src/lib/lbitlib.c	1969-12-31 20:00:00.000000000 -0400
+++ LOCAL/scite/lua/src/lib/lbitlib.c	2004-09-20 23:47:43.000000000 -0300
@@ -0,0 +1,115 @@
+/* Bitwise operations library */
+/* Reuben Thomas   nov00-09jan04 */
+
+
+/* README
+ *                           bitlib release 17
+ *                           -----------------
+ * 
+ *                    by Reuben Thomas (rrt@sc3d.org)
+ * 
+ * 
+ * bitlib is a C library for Lua 5.0 that provides bitwise operations.
+ * It is copyright Reuben Thomas 2000-2003, and is released under the
+ * MIT license, like Lua (see http://www.lua.org/copyright.html for the
+ * full license; it's basically the same as the BSD license). There is no
+ * warranty.
+ * 
+ * Please report bugs and make suggestions to the email address above.
+ * 
+ * Thanks to John Passaniti for his bitwise operations library, some of
+ * whose ideas I used, and to Thatcher Ulrich for portability fixes.
+ * 
+ * 
+ * Installation
+ * ------------
+ * 
+ * There is no header file.  The initialisation function is luaopen_bit.
+ * Declare the function as extern int luaopen_bit(lua_State *L).
+ *
+ * 
+ * Use
+ * ---
+ * 
+ * Lua functions provided:
+ * 
+ * bit.bnot(a)       returns the one's complement of a
+ * bit.band(w1,...)  returns the bitwise and of the w's
+ * bit.bor(w1,...)   returns the bitwise or of the w's
+ * bit.bxor(w1,...)  returns the bitwise exclusive or of the w's
+ * bit.lshift(a,b)   returns a shifted left b places
+ * bit.rshift(a,b)   returns a shifted logically right b places
+ * bit.arshift(a,b)  returns a shifted arithmetically right b places
+ * bit.mod(a,b)      returns the integer remainder of a divided by b
+ * 
+ * All function arguments should be integers. The number of bits
+ * available for logical operations depends on the data type used to
+ * represent Lua numbers; this is typically 8-byte IEEE floats, which
+ * give 53 bits (the size of the mantissa).
+ * 
+ * The logical operations start with "b" for "bit" to avoid clashing with
+ * reserved words; although "xor" isn't a reserved word, it seemed better
+ * to use "bxor" for consistency.
+ */
+
+
+#include "lauxlib.h"
+#include "lua.h"
+
+typedef long long Integer;
+typedef unsigned long long UInteger;
+
+#define luaL_checkbit(L, n)  ((Integer)luaL_checknumber(L, n))
+#define luaL_checkubit(L, n) ((UInteger)luaL_checkbit(L, n))
+
+#define TDYADIC(name, op, checkbit1, checkbit2) \
+  static int bit_ ## name(lua_State* L) { \
+    lua_pushnumber(L, \
+      checkbit1(L, 1) op checkbit2(L, 2)); \
+    return 1; \
+  }
+
+#define DYADIC(name, op) \
+  TDYADIC(name, op, luaL_checkbit, luaL_checkbit)
+
+#define MONADIC(name, op) \
+  static int bit_ ## name(lua_State* L) { \
+    lua_pushnumber(L, op luaL_checkbit(L, 1)); \
+    return 1; \
+  }
+
+#define VARIADIC(name, op) \
+  static int bit_ ## name(lua_State *L) { \
+    int n = lua_gettop(L), i; \
+    Integer w = luaL_checkbit(L, 1); \
+    for (i = 2; i <= n; i++) \
+      w op luaL_checkbit(L, i); \
+    lua_pushnumber(L, w); \
+    return 1; \
+  }
+
+MONADIC(bnot,     ~)
+VARIADIC(band,    &=)
+VARIADIC(bor,     |=)
+VARIADIC(bxor,    ^=)
+TDYADIC(lshift,  <<, luaL_checkbit, luaL_checkubit)
+TDYADIC(rshift,  >>, luaL_checkubit, luaL_checkubit)
+TDYADIC(arshift, >>, luaL_checkbit, luaL_checkubit)
+DYADIC(mod,      %)
+
+static const struct luaL_reg bitlib[] = {
+  {"bnot",    bit_bnot},
+  {"band",    bit_band},
+  {"bor",     bit_bor},
+  {"bxor",    bit_bxor},
+  {"lshift",  bit_lshift},
+  {"rshift",  bit_rshift},
+  {"arshift", bit_arshift},
+  {"mod",     bit_mod},
+  {NULL, NULL}
+};
+
+LUALIB_API int luaopen_bit (lua_State *L) {
+  luaL_openlib(L, "bit", bitlib, 0);
+  return 1;
+}
diff -rNu -x '*.a' -x '*.aps' -x '*.bsc' -x '*.dll' -x '*.dsw' -x '*.exe' -x '*.idb' -x '*.ilc' -x '*.ild' -x '*.ilf' -x '*.ilk' -x '*.ils' -x '*.lib' -x '*.map' -x '*.ncb' -x '*.obj' -x '*.o' -x '*.opt' -x '*.pdb' -x '*.plg' -x '*.res' -x '*.sbr' -x '*.tds' -x '*.exp' -x dm.mak -x CVS -x Repository -x Root -x 'Entries.*' -x '*.patch' -x '*.zip' -x '.#*.*' -x '*.bak' -x 'Copy *.*' -x '*.pyc' -x Embedded.properties REL/scite/lua/src/lib/lbitlib.c LOCAL/scite/lua/src/lib/lbitlib.c
--- REL/scite/lua/src/lib/lbitlib.c	1969-12-31 20:00:00.000000000 -0400
+++ LOCAL/scite/lua/src/lib/lbitlib.c	2004-09-20 23:47:43.000000000 -0300
@@ -0,0 +1,115 @@
+/* Bitwise operations library */
+/* Reuben Thomas   nov00-09jan04 */
+
+
+/* README
+ *                           bitlib release 17
+ *                           -----------------
+ * 
+ *                    by Reuben Thomas (rrt@sc3d.org)
+ * 
+ * 
+ * bitlib is a C library for Lua 5.0 that provides bitwise operations.
+ * It is copyright Reuben Thomas 2000-2003, and is released under the
+ * MIT license, like Lua (see http://www.lua.org/copyright.html for the
+ * full license; it's basically the same as the BSD license). There is no
+ * warranty.
+ * 
+ * Please report bugs and make suggestions to the email address above.
+ * 
+ * Thanks to John Passaniti for his bitwise operations library, some of
+ * whose ideas I used, and to Thatcher Ulrich for portability fixes.
+ * 
+ * 
+ * Installation
+ * ------------
+ * 
+ * There is no header file.  The initialisation function is luaopen_bit.
+ * Declare the function as extern int luaopen_bit(lua_State *L).
+ *
+ * 
+ * Use
+ * ---
+ * 
+ * Lua functions provided:
+ * 
+ * bit.bnot(a)       returns the one's complement of a
+ * bit.band(w1,...)  returns the bitwise and of the w's
+ * bit.bor(w1,...)   returns the bitwise or of the w's
+ * bit.bxor(w1,...)  returns the bitwise exclusive or of the w's
+ * bit.lshift(a,b)   returns a shifted left b places
+ * bit.rshift(a,b)   returns a shifted logically right b places
+ * bit.arshift(a,b)  returns a shifted arithmetically right b places
+ * bit.mod(a,b)      returns the integer remainder of a divided by b
+ * 
+ * All function arguments should be integers. The number of bits
+ * available for logical operations depends on the data type used to
+ * represent Lua numbers; this is typically 8-byte IEEE floats, which
+ * give 53 bits (the size of the mantissa).
+ * 
+ * The logical operations start with "b" for "bit" to avoid clashing with
+ * reserved words; although "xor" isn't a reserved word, it seemed better
+ * to use "bxor" for consistency.
+ */
+
+
+#include "lauxlib.h"
+#include "lua.h"
+
+typedef long long Integer;
+typedef unsigned long long UInteger;
+
+#define luaL_checkbit(L, n)  ((Integer)luaL_checknumber(L, n))
+#define luaL_checkubit(L, n) ((UInteger)luaL_checkbit(L, n))
+
+#define TDYADIC(name, op, checkbit1, checkbit2) \
+  static int bit_ ## name(lua_State* L) { \
+    lua_pushnumber(L, \
+      checkbit1(L, 1) op checkbit2(L, 2)); \
+    return 1; \
+  }
+
+#define DYADIC(name, op) \
+  TDYADIC(name, op, luaL_checkbit, luaL_checkbit)
+
+#define MONADIC(name, op) \
+  static int bit_ ## name(lua_State* L) { \
+    lua_pushnumber(L, op luaL_checkbit(L, 1)); \
+    return 1; \
+  }
+
+#define VARIADIC(name, op) \
+  static int bit_ ## name(lua_State *L) { \
+    int n = lua_gettop(L), i; \
+    Integer w = luaL_checkbit(L, 1); \
+    for (i = 2; i <= n; i++) \
+      w op luaL_checkbit(L, i); \
+    lua_pushnumber(L, w); \
+    return 1; \
+  }
+
+MONADIC(bnot,     ~)
+VARIADIC(band,    &=)
+VARIADIC(bor,     |=)
+VARIADIC(bxor,    ^=)
+TDYADIC(lshift,  <<, luaL_checkbit, luaL_checkubit)
+TDYADIC(rshift,  >>, luaL_checkubit, luaL_checkubit)
+TDYADIC(arshift, >>, luaL_checkbit, luaL_checkubit)
+DYADIC(mod,      %)
+
+static const struct luaL_reg bitlib[] = {
+  {"bnot",    bit_bnot},
+  {"band",    bit_band},
+  {"bor",     bit_bor},
+  {"bxor",    bit_bxor},
+  {"lshift",  bit_lshift},
+  {"rshift",  bit_rshift},
+  {"arshift", bit_arshift},
+  {"mod",     bit_mod},
+  {NULL, NULL}
+};
+
+LUALIB_API int luaopen_bit (lua_State *L) {
+  luaL_openlib(L, "bit", bitlib, 0);
+  return 1;
+}