 +// end modified by Mitchell
  
  #endif
---- scite-latest/scintilla/include/Scintilla.h	2009-07-21 06:55:09.000000000 -0400
-+++ scintillua/scintilla/include/Scintilla.h	2010-01-18 13:00:36.000000000 -0500
-@@ -770,6 +770,8 @@
- #define KEYWORDSET_MAX 8
- #define SCI_SETKEYWORDS 4005
- #define SCI_SETLEXERLANGUAGE 4006
-+#define SCI_GETLEXERLANGUAGE 4012 // added by Mitchell
+--- scite-latest/scintilla/include/Scintilla.h	2009-07-21 10:55:09.000000000 +0000
++++ scintillua/scintilla/include/Scintilla.h	2010-01-26 15:50:57.000000000 +0000
+@@ -15,6 +15,10 @@
+ typedef BOOL bool;
+ #endif
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #if PLAT_WIN
+ /* Return false on failure: */
+ bool Scintilla_RegisterClasses(void *hInstance);
+@@ -22,6 +26,10 @@
+ #endif
+ int Scintilla_LinkLexers();
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ /* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
+  * hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
+  * May need to be changed for 64 bit platforms. */
+@@ -254,6 +262,8 @@
+ #define SCI_INDICGETUNDER 2511
+ #define SCI_SETWHITESPACEFORE 2084
+ #define SCI_SETWHITESPACEBACK 2085
++#define SCI_SETWHITESPACESIZE 2086
++#define SCI_GETWHITESPACESIZE 2087
+ #define SCI_SETSTYLEBITS 2090
+ #define SCI_GETSTYLEBITS 2091
+ #define SCI_SETLINESTATE 2092
+@@ -468,6 +478,13 @@
+ #define SCI_APPENDTEXT 2282
+ #define SCI_GETTWOPHASEDRAW 2283
+ #define SCI_SETTWOPHASEDRAW 2284
++#define SC_EFF_QUALITY_MASK 0xF
++#define SC_EFF_QUALITY_DEFAULT 0
++#define SC_EFF_QUALITY_NON_ANTIALIASED 1
++#define SC_EFF_QUALITY_ANTIALIASED 2
++#define SC_EFF_QUALITY_LCD_OPTIMIZED 3
++#define SCI_SETFONTQUALITY 2611
++#define SCI_GETFONTQUALITY 2612
+ #define SCI_TARGETFROMSELECTION 2287
+ #define SCI_LINESJOIN 2288
+ #define SCI_LINESSPLIT 2289
+@@ -642,6 +659,7 @@
+ #define SCI_SETWHITESPACECHARS 2443
+ #define SCI_SETCHARSDEFAULT 2444
+ #define SCI_AUTOCGETCURRENT 2445
++#define SCI_AUTOCGETCURRENTTEXT 2610
+ #define SCI_ALLOCATE 2446
+ #define SCI_TARGETASUTF8 2447
+ #define SCI_SETLENGTHFORENCODE 2448
+@@ -720,6 +738,8 @@
+ #define SCI_GETADDITIONALSELECTIONTYPING 2566
+ #define SCI_SETADDITIONALCARETSBLINK 2567
+ #define SCI_GETADDITIONALCARETSBLINK 2568
++#define SCI_SETADDITIONALCARETSVISIBLE 2608
++#define SCI_GETADDITIONALCARETSVISIBLE 2609
+ #define SCI_GETSELECTIONS 2570
+ #define SCI_CLEARSELECTIONS 2571
+ #define SCI_SETSELECTION 2572
+@@ -775,6 +795,8 @@
+ #define SCI_GETPROPERTYEXPANDED 4009
+ #define SCI_GETPROPERTYINT 4010
+ #define SCI_GETSTYLEBITSNEEDED 4011
++#define SCI_GETLEXERLANGUAGE 4012
 +#define SCI_GETSTYLENAME 4013 // added by Mitchell
- #define SCI_LOADLEXERLIBRARY 4007
- #define SCI_GETPROPERTY 4008
- #define SCI_GETPROPERTYEXPANDED 4009
---- scite-latest/scintilla/include/Scintilla.iface	2009-07-21 06:55:09.000000000 -0400
-+++ scintillua/scintilla/include/Scintilla.iface	2010-01-18 13:00:36.000000000 -0500
-@@ -2064,6 +2064,14 @@
- # Set the lexing language of the document based on string name.
- set void SetLexerLanguage=4006(, string language)
- 
+ #define SC_MOD_INSERTTEXT 0x1
+ #define SC_MOD_DELETETEXT 0x2
+ #define SC_MOD_CHANGESTYLE 0x4
+--- scite-latest/scintilla/include/Scintilla.iface	2009-07-21 10:55:09.000000000 +0000
++++ scintillua/scintilla/include/Scintilla.iface	2010-01-26 15:51:52.000000000 +0000
+@@ -571,6 +571,12 @@
+ # Set the background colour of all whitespace and whether to use this setting.
+ fun void SetWhitespaceBack=2085(bool useSetting, colour back)
+ 
++# Set the size of the dots used to mark space characters.
++set void SetWhitespaceSize=2086(int size,)
++
++# Get the size of the dots used to mark space characters.
++get int GetWhitespaceSize=2087(,)
++
+ # Divide each styling byte into lexical class bits (default: 5) and indicator
+ # bits (default: 3). If a lexer requires more than 32 lexical states, then this
+ # is used to expand the possible states.
+@@ -1199,6 +1205,21 @@
+ # and then the foreground. This avoids chopping off characters that overlap the next run.
+ set void SetTwoPhaseDraw=2284(bool twoPhase,)
+ 
++# Control font anti-aliasing.
++
++enu FontQuality=SC_EFF_
++val SC_EFF_QUALITY_MASK=0xF
++val SC_EFF_QUALITY_DEFAULT=0
++val SC_EFF_QUALITY_NON_ANTIALIASED=1
++val SC_EFF_QUALITY_ANTIALIASED=2
++val SC_EFF_QUALITY_LCD_OPTIMIZED=3
++
++# Choose the quality level for text from the FontQuality enumeration.
++set void SetFontQuality=2611(int fontQuality,)
++
++# Retrieve the quality level for text.
++get int GetFontQuality=2612(,)
++
+ # Make the target range start and end be the same as the selection range start and end.
+ fun void TargetFromSelection=2287(,)
+ 
+@@ -1718,6 +1739,10 @@
+ # Get currently selected item position in the auto-completion list
+ fun int AutoCGetCurrent=2445(,)
+ 
++# Get currently selected item text in the auto-completion list
++# Returns the length of the item text
++fun int AutoCGetCurrentText=2610(, stringresult s)
++
+ # Enlarge the document to a particular size of text bytes.
+ fun void Allocate=2446(int bytes,)
+ 
+@@ -1945,6 +1970,12 @@
+ # Whether additional carets will blink
+ get bool GetAdditionalCaretsBlink=2568(,)
+ 
++# Set whether additional carets are visible
++set void SetAdditionalCaretsVisible=2608(bool additionalCaretsBlink,)
++
++# Whether additional carets are visible
++get bool GetAdditionalCaretsVisible=2609(,)
++
+ # How many selections are there?
+ get int GetSelections=2570(,)
+ 
+@@ -1976,13 +2007,13 @@
+ set void SetSelectionNStart=2584(int selection, position pos)
+ 
+ # Returns the position at the start of the selection.
+-get position GetSelectionNStart=2585(,)
++get position GetSelectionNStart=2585(int selection,)
+ 
+ # Sets the position that ends the selection - this becomes the currentPosition.
+ set void SetSelectionNEnd=2586(int selection, position pos,)
+ 
+ # Returns the position at the end of the selection.
+-get position GetSelectionNEnd=2587(,)
++get position GetSelectionNEnd=2587(int selection,)
+ 
+ set void SetRectangularSelectionCaret=2588(position pos,)
+ get position GetRectangularSelectionCaret=2589(,)
+@@ -2081,6 +2112,15 @@
+ # Retrieve the number of bits the current lexer needs for styling.
+ get int GetStyleBitsNeeded=4011(,)
+ 
++# Retrieve the name of the lexer.
++# Return the length of the text.
++get int GetLexerLanguage=4012(, stringresult text)
++
 +# added by Mitchell
-+# Retrieve the lexing language string name of the document.
-+get int GetLexerLanguage=4012(, stringresult language)
-+
 +# Retrieve the name associated with a style number.
 +get int GetStyleName=4013(int style, stringresult stylename)
 +# end added by Mitchell
 +
- # Load a lexer library (dll / so).
- fun void LoadLexerLibrary=4007(, string path)
- 
-@@ -2153,1510 +2161,13 @@
+ # Notifications
+ # Type of modification and the action which caused the modification.
+ # These are defined as a bit mask to make it easy to specify which notifications are wanted.
+@@ -2153,1510 +2193,13 @@
  enu Lexer=SCLEX_
  val SCLEX_CONTAINER=0
  val SCLEX_NULL=1

 		}
 	}
 	if (braceAtCaret >= 0) {
@@ -3198,10 +3202,16 @@
 		return false;
 	}
 

 	{"SCFIND_MATCHCASE",4},
 	{"SCFIND_POSIX",0x00400000},
 	{"SCFIND_REGEXP",0x00200000},
@@ -1572,6 +341,7 @@
 	{"SCI_CALLTIPUSESTYLE",2212},
 	{"SCI_GETADDITIONALCARETFORE",2605},
 	{"SCI_GETADDITIONALCARETSBLINK",2568},
+	{"SCI_GETADDITIONALCARETSVISIBLE",2609},
 	{"SCI_GETADDITIONALSELALPHA",2603},
 	{"SCI_GETADDITIONALSELECTIONTYPING",2566},
 	{"SCI_GETANCHOR",2009},
@@ -1608,6 +378,7 @@
 	{"SCI_GETFOLDEXPANDED",2230},
 	{"SCI_GETFOLDLEVEL",2223},
 	{"SCI_GETFOLDPARENT",2225},
+	{"SCI_GETFONTQUALITY",2612},
 	{"SCI_GETHIGHLIGHTGUIDE",2135},
 	{"SCI_GETHOTSPOTACTIVEUNDERLINE",2496},
 	{"SCI_GETHOTSPOTSINGLELINE",2497},
@@ -1662,6 +433,8 @@
 	{"SCI_GETSELECTIONNANCHORVIRTUALSPACE",2583},
 	{"SCI_GETSELECTIONNCARET",2577},
 	{"SCI_GETSELECTIONNCARETVIRTUALSPACE",2581},
+	{"SCI_GETSELECTIONNEND",2587},
+	{"SCI_GETSELECTIONNSTART",2585},
 	{"SCI_GETSELECTIONS",2570},
 	{"SCI_GETSELECTIONSTART",2143},
 	{"SCI_GETSELEOLFILLED",2479},
@@ -1682,6 +455,7 @@
 	{"SCI_GETVIEWWS",2020},
 	{"SCI_GETVIRTUALSPACEOPTIONS",2597},
 	{"SCI_GETVSCROLLBAR",2281},
+	{"SCI_GETWHITESPACESIZE",2087},
 	{"SCI_GETWRAPINDENTMODE",2473},
 	{"SCI_GETWRAPMODE",2269},
 	{"SCI_GETWRAPSTARTINDENT",2465},
@@ -1707,6 +481,7 @@
 	{"SCI_SELECTIONISRECTANGLE",2372},
 	{"SCI_SETADDITIONALCARETFORE",2604},
 	{"SCI_SETADDITIONALCARETSBLINK",2567},
+	{"SCI_SETADDITIONALCARETSVISIBLE",2608},
 	{"SCI_SETADDITIONALSELALPHA",2602},
 	{"SCI_SETADDITIONALSELBACK",2601},
 	{"SCI_SETADDITIONALSELECTIONTYPING",2565},
@@ -1737,6 +512,7 @@
 	{"SCI_SETFOCUS",2380},
 	{"SCI_SETFOLDEXPANDED",2229},
 	{"SCI_SETFOLDLEVEL",2222},
+	{"SCI_SETFONTQUALITY",2611},
 	{"SCI_SETHIGHLIGHTGUIDE",2134},
 	{"SCI_SETHOTSPOTACTIVEUNDERLINE",2412},
 	{"SCI_SETHOTSPOTSINGLELINE",2421},
@@ -1749,7 +525,6 @@
 	{"SCI_SETKEYWORDS",4005},
 	{"SCI_SETLAYOUTCACHE",2272},
 	{"SCI_SETLEXER",4001},
