Scintilla 2.26:
* Released 25 May 2011.
* Folding margin symbols can be highlighted for the current folding block. Feature #3147069.
* Selected lines can be moved up or down together. Feature #3304850.
* SciTE can highlight all occurrences of the current word or selected text. Feature #3291636.
* Experimental GTK+ 3.0 support: build with "make GTK3=1".
* INDIC_STRAIGHTBOX added. Is similar to INDIC_ROUNDBOX but without rounded corners. Bug #3290435.
* Can show brace matching and mismatching with indicators instead of text style. Translucency of outline can be altered for INDIC_ROUNDBOX and INDIC_STRAIGHTBOX. Feature #3290434.
* SciTE can automatically indent python by examining previous line for scope-starting ':' with indent.python.colon.
* Batch file lexer allows braces '(' or ')' inside variable names.
* The cpp lexer only recognises Vala triple quoted strings when lexer.cpp.triplequoted.strings property is set. Bug #3239234.
* Make file lexer treats a variable with a nested variable like $(f$(qx)b) as one variable. Bug #3298223.
* Folding bug fixed for JavaScript with nested PHP. Bug #3193530.
* HTML lexer styles Django's {# #} comments. Bug #3013798.
* HTML lexer styles JavaScript regular expression correctly for /abc/i.test('abc');. Bug #3209108.
* Inno Setup Script lexer now works properly when it restarts from middle of [CODE] section. Bug #3283880. Bug #3129044.
* Lua lexer updated for Lua 5.2 with hexadecimal floating-point numbers and '\*' whitespace escaping in strings. Feature #3243811.
* Perl folding folds "here doc"s and adds options fold.perl.at.else and fold.perl.comment.explicit. Fold structure for Perl fixed. Feature #3112671. Bug #3265401.
* Python lexer supports cpdef keyword for Cython. Bug #3279728.
* SQL folding option lexer.sql.fold.at.else renamed to fold.sql.at.else. Bug #3271474.
* SQL lexer no longer treats ';' as terminating a comment. Bug #3196071.
* Text drawing and measurement segmented into smaller runs to avoid platform bugs. Bug #3277449. Bug #3165743.
* SciTE on Windows adds temp.files.sync.load property to open dropped temporary files synchronously as they may be removed before they can be opened asynchronously. Bug #3072009.
* Bug fixed with indentation guides ignoring first line in SC_IV_LOOKBOTH mode. Bug #3291317.
* Bugs fixed in backward regex search. Bug #3292659.
* Bugs with display of folding structure fixed for wrapped lines and where there is a fold header but no body. Bug #3291579. Bug #3265401.
* SciTE on Windows cursor changes to an arrow now when over horizontal splitter near top of window. Bug #3286620.
* Fixed default widget size problem on GTK+. Bug #3267892.
* Fixed font size when using Cairo on GTK+. Bug #3272662.
* Fixed primary selection and cursor issues on GTK+ when unrealized then realized. Bug #3256153.
* Right click now cancels selection on GTK+ like on Windows. Bug #3235190.
* SciTE on GTK+ implements z-order buffer switching like on Windows. Bug #3228384.
* Improve selection position after SciTE Insert Abbreviation command when abbreviation expansion includes '|'.
Merge branch 'ScintillaHistoryMerge'

Conflicts:
	include/Platform.h
	scintilla/Document.cxx
	scintilla/Document.h
	scintilla/Editor.cxx
	scintilla/Editor.h
	scintilla/Indicator.cxx
	scintilla/Indicator.h
	scintilla/LineMarker.cxx
	scintilla/LineMarker.h
	scintilla/PositionCache.cxx
	scintilla/PositionCache.h
	scintilla/Style.cxx
	scintilla/Style.h
	scintilla/ViewStyle.cxx
	scintilla/ViewStyle.h
	src/CallTip.cxx
	src/ScintillaBase.cxx
Integrated Scintilla release 2.27

* Released 20 June 2011.
* On recent GTK+ 2.x versions when using Cairo, bug fixed where wrong colours were drawn.
* SciTE on GTK+ slow performance in menu maintenance fixed. Bug #3315233.
* Cocoa platform supports 64-bit builds and uses only non-deprecated APIs. Asian Input Method Editors are supported. Autocompletion lists and calltips implemented. Control identifier used in notifications.
* On Cocoa, rectangular selection now uses Option/Alt key to be compatible with Apple Human Interface Guidelines and other applications. The Control key is reported with an SCMOD_META modifier bit.
* API added for setting and retrieving the identifier number used in notifications.
* SCI_SETEMPTYSELECTION added to set selection without scrolling or redrawing more than needed. Feature #3314877.
* Added new indicators. INDIC_DASH and INDIC_DOTS are variants of underlines. INDIC_SQUIGGLELOW indicator added as shorter alternative to INDIC_SQUIGGLE for small fonts. Bug #3314591
* Margin line selection can be changed to select display lines instead of document lines. Bug #3312763.
* On Windows, SciTE can perform reverse searches by pressing Shift+Enter in the Find or Replace strips or dialogs.
* Matlab lexer does not special case '\' in single quoted strings. Bug #948757 Bug #1755950 Bug #1888738 Bug #3316852.
* Verilog lexer supports SystemVerilog folding and keywords.
* Font leak fixed. Bug #3306156.
* Automatic scrolling works for long wrapped lines. Bug #3312763.
* Multiple typing works for cases where selections collapse together. Bug #3309906.
* Fold expanded when needed in word wrap mode. Bug #3291579.
* Bug fixed with edge drawn in wrong place on wrapped lines. Bug #3314807.
* Bug fixed with unnecessary scrolling for SCI_GOTOLINE. Bug #3303406.
* Bug fixed where extra step needed to undo SCI_CLEAR in virtual space. Bug #3159691.
* Regular expression search fixed for \$ on last line of search range. Bug #3313746.
* SciTE performance improved when switching to a tab with a very large file. Bug #3311421.
* On Windows, SciTE advanced search remembers the "Search only in this style" setting. Bug #3313344.
* On GTK+, SciTE opens help using "xdg-open" instead of "netscape" as "netscape" no longer commonly installed. Bug #3314377.
* SciTE script lexers can use 256 styles.
* SciTE word highlight works for words containing DBCS characters. Bug #3315173.
* Compilation fixed for wxWidgets. Bug #3306156.
Merge branch 'ScintillaHistoryMerge'

Conflicts:
	include/Platform.h
	scintilla/Editor.cxx
	scintilla/Editor.h
	scintilla/Indicator.cxx
	scintilla/Style.cxx
Integrated Scintilla release 2.28

* Released 1 August 2011.
* GTK+ Cairo support works back to GTK+ version 2.8. Requires changing Scintilla source code to enable before GTK+ 2.22. Bug #3322351.
* Translucent images in RGBA format can be used for margin markers and in autocompletion lists.
* INDIC_DOTBOX added as a translucent dotted rectangular indicator.
* Asian text input using IME works for GTK+ 3.x and GTK+ 2.x with Cairo.
* On GTK+, IME works for Ctrl+Shift+U Unicode input in Scintilla. For SciTE, Ctrl+Shift+U is still Make Selection Uppercase.
* Key bindings for GTK+ on OS X made compatible with Cocoa port and platform conventions.
* Cocoa port supports different character encodings, improves scrolling performance and drag image appearance. The control ID is included in WM_COMMAND notifications. Text may be deleted by dragging to the trash. ScrollToStart and ScrollToEnd key commands added to simplify implementation of standard OS X Home and End behaviour.
* SciTE on GTK+ uses a paned widget to contain the edit and output panes instead of custom code. This allows the divider to be moved easily on GTK+ 3 and its appearance follows GTK+ conventions more closely.
* SciTE builds and installs on BSD. Bug #3324644.
* Cobol supports fixed format comments. Bug #3014850.
* Mako template language block syntax extended and ## comments recognised. Feature #3325178. Bug #3318818.
* Folding of Mako template language within HTML fixed. Bug #3324563.
* Python lexer has lexer.python.keywords2.no.sub.identifiers option to avoid highlighting second set of keywords following '.'. Bug #3325333.
* Python folder fixes bug where fold would not extend to final line. Bug #3349157.
* SciTE treats LPEG lexers the same as script lexers by setting all 8 style bits.
* For Cocoa, crashes with unsupported font variants and memory leaks for colour objects fixed.
* Shift-JIS lead byte ranges modified to match Windows.
* Mouse pointer changes over selection to an arrow more consistently. Bug #3315756.
* Bug fixed with annotations beyond end of document. Bug #3347268.
* Incorrect drawing fixed for combination of background colour change and translucent selection. Bug #3377116.
* Lexers initialized correctly when started at position other than start of line. Bug #3377148.
* Fold highlight drawing fixed for some situations. Bug #3323015. Bug #3323805.
* Case insensitive search fixed for cases where folded character uses fewer bytes than base character. Bug #3362038.
* SciTE bookmark.alpha setting fixed. Bug #3373907.
Integrated Scintilla release 2.29

* Released 16 September 2011.
* To automatically discover the encoding of a file when opening it, SciTE can run a program set with command.discover.properties. Feature #3324341.
* Cairo always used for drawing on GTK+.
* The set of properties files imported by SciTE can be controlled with the properties imports.include and imports.exclude. The import statement has been extended to allow "import *". * The properties files for some languages are no longer automatically loaded by default. The properties files affected are avenue, baan, escript, lot, metapost, and mmixal.
* C++ lexer fixed a bug with raw strings being recognised too easily. Bug #3388122.
* LaTeX lexer improved with more states and fixes to most outstanding bugs. Bug #1493111. Bug #1856356. Bug #3081692.
* Lua lexer updates for Lua 5.2 beta with goto labels and "\z" string escape. Feature #3386330.
* Perl string styling highlights interpolated variables. Feature #3394258. Bug #3076629.
* Perl lexer updated for Perl 5.14.0 with 0X and 0B numeric literal prefixes, break keyword and "+" supported in subroutine prototypes. Feature #3388802.
* Perl bug fixed with CRLF line endings.
* Markdown lexer fixed to not change state with "_" in middle of word. Bug #3398184.
* Cocoa restores compatibility with OS X 10.5.
* Mouse pointer changes over selection to an arrow near start when scrolled horizontally. Bug #3389055.
* Indicators that finish at the end of the document no longer expand when text is appended. Bug #3378718.
* SparseState merge fixed to check if other range is empty. Bug #3387053.
* On Windows, autocompletion lists will scroll instead of document when mouse wheel spun. Feature #3403600.
* SciTE performs more rapid polling for command completion so will return faster and report more accurate times.
* SciTE resizes panes proportionally when switched between horizontal and vertical layout. Feature #3376784.
* SciTE on GTK+ opens multiple files into a single instance more reliably. Bug #3363754.
Merge branch 'ScintillaHistoryMerge'

Conflicts:
	include/Platform.h
	scintilla/Document.cxx
	scintilla/Editor.cxx
	scintilla/Editor.h
	scintilla/Indicator.cxx
	scintilla/LineMarker.cxx
	scintilla/PositionCache.h
	scintilla/XPM.cxx
	scintilla/XPM.h
	scintilla/lexers/LexOthers.cxx
	src/ScintillaBase.cxx
* Integrated Scintilla release 3.0.0

* Released 1 November 2011.
* Carbon platform support removed. OS X applications should switch to Cocoa.
* On Windows Vista or newer, drawing may be performed with Direct2D and DirectWrite instead of GDI.
* Cairo is now used for all drawing on GTK+. GDK drawing was removed.
* Paletted display support removed.
* Fractional font sizes can be specified.
* Different weights of text supported on some platforms instead of just normal and bold.
* Sub-pixel character positioning supported.
* SciTE loads files in the background without blocking the user interface.
* SciTE can display diagnostic messages interleaved with the text of files immediately after the line referred to by the diagnostic.
* New API to see if all lines are visible which can be used to optimize processing fold structure notifications.
* Scrolling optimized by avoiding invalidation of fold margin when redrawing whole window.
* Optimized SCI_MARKERNEXT.
* C++ lexer supports Pike hash quoted strings when turned on with lexer.cpp.hashquoted.strings.
* Fixed incorrect line height with annotations in wrapped mode when there are multiple views. Bug #3388159.
* Calltips may be displayed above the text as well as below. Bug #3410830.
* For huge files SciTE only examines the first megabyte for newline discovery.
* SciTE on GTK+ removes the fileselector.show.hidden property and check box as this was buggy and GTK+ now supports an equivalent feature. Bug #3413630.
* SciTE on GTK+ supports mnemonics in dynamic menus.
* SciTE on GTK+ displays the user's home directory as '~' in menus to make them shorter.
Merge branch 'ScintillaHistoryMerge'

Conflicts:
	include/Platform.h
	scintilla/Editor.cxx
	scintilla/Editor.h
	scintilla/Indicator.cxx
	scintilla/Indicator.h
	scintilla/LineMarker.cxx
	scintilla/LineMarker.h
	scintilla/PositionCache.cxx
	scintilla/PositionCache.h
	scintilla/Scintilla.h
	scintilla/Style.cxx
	scintilla/Style.h
	scintilla/ViewStyle.cxx
	scintilla/ViewStyle.h
	scintilla/XPM.cxx
	scintilla/XPM.h
	src/CallTip.cxx
	src/CallTip.h
	src/ScintillaBase.cxx
	src/ScintillaBase.h
Integrated Scintilla release 3.0.1

* Released 15 November 2011.
* SciTE on Windows now runs Lua scripts directly on the main thread instead of starting them on a secondary thread and then moving back to the main thread.
* Highlight "else" as a keyword for TCL in the same way as other languages. Bug #1836954.
* Fix problems with setting fonts for autocompletion lists on Windows where font handles were copied and later deleted causing a system default font to be used.
* Fix font size used on Windows for Asian language input methods which sometimes led to IME not being visible. Bug #3436753.
* Fixed polygon drawing on Windows so fold symbols are visible again. Bug #3433558.
* Changed background drawing on GTK+ to allow for fractional character positioning as occurs on OS X as this avoids faint lines at lexeme boundaries.
* Ensure pixmaps allocated before painting as there was a crash when Scintilla drew without common initialisation calls. Bug #3432354.
* Fixed SciTE on Windows bug causing wrong caret position after indenting a selection. Bug #3433433.
* Fixed SciTE session saving to store buffer position matching buffer. Bug #3434372.
* Fixed leak of document objects in SciTE.
* Recognize URL characters '?' and '%' for Open Selected command in SciTE. Bug #3429409.
Integrated Scintilla release 3.0.2

* Released 9 December 2011.
* SciTE saves files in the background without blocking the user interface.
* Printing implemented in SciTE on GTK+ 3.x.
* ILoader interface for background loading finalised and documented.
* CoffeeScript lexer added.
* C++ lexer fixes crash with "#if defined( XXX 1".
* Crash with Direct2D on Windows fixed.
* Backspace removing protected range fixed. Bug #3445911.
* Cursor setting failure on Windows when screen saver on fixed. Bug #3438780.
* SciTE on GTK+ hang fixed with -open:file option. Bug #3441980.
* Failure to evaluate shbang fixed in SciTE. Bug #3441801.
* SciTE failure to treat files starting with "<?xml" as XML fixed. Bug #3440718.
* Made untitled tab saveable when created by closing all files. Bug #3440244.
* SciTE crash fixed when using Scintillua.
* SciTE revert command fixed so that undo works on individual actions instead of undoing to revert point.
* Focus loss in SciTE when opening a recent file fixed. Bug #3440142.
* Fixed SciTE SelLength property to measure characters instead of bytes. Bug #3283519.
Integrated Scintilla release 3.0.3

* Released 28 January 2012.
* Printing works on GTK+ version 2.x as well as 3.x.
* Lexer added for the AviSynth language. Feature #3475611.
* Lexer added for the Take Command / TCC scripting language. Feature #3462462.
* CSS lexer gains support for SCSS. Feature #3268017.
* CPP lexer fixes problems in the preprocessor structure caused by continuation lines. Bug #3458508.
* Errorlist lexer handles column numbers for GCC format diagnostics. In SciTE, Next Message goes to column where this can be decoded from GCC format diagnostics. Feature #3453075.
* HTML folder fixes spurious folds on some tags. Bug #3459262.
* Ruby lexer fixes bug where '=' at start of file caused whole file to appear as a comment. Bug #3452488.
* SQL folder folds blocks of single line comments. Feature #3467425.
* On Windows using Direct2D, defer invalidation of render target until completion of painting to avoid failures.
* Further support of fractional positioning. Spaces, tabs, and single character tokens can take fractional space and wrapped lines are positioned taking fractional positions into account. Bug #3471998.
* On Windows using Direct2D, fix extra carets appearing. Bug #3471998.
* For autocompletion lists Page Up and Down move by the list height instead of by 5 lines. Bug #3455493.
* For SCI_LINESCROLLDOWN/UP don't select into virtual space. Bug #3451681.
* Fix fold highlight not being fully drawn. Bug #3469936.
* Fix selection margin appearing black when starting in wrap mode.
* Fix crash when changing end of document after adding an annotation. Bug #3476637.
* Fix problems with building to make RPMs. Bug #3476149.
* Fix problem with building on GTK+ where recent distributions could not find gmodule. Bug #3469056.
* Fix problem with installing SciTE on GTK+ due to icon definition in .desktop file including an extension. Bug #3476117.
* Fix SciTE bug where new buffers inherited some properties from previously opened file. Bug #3457060.
* Fix focus when closing tab in SciTE with middle click. Focus moves to edit pane instead of staying on tab bar. Bug #3440142.
* For SciTE on Windows fix bug where Open Selected Filename for URL would append a file extension. Feature #3459185.
* For SciTE on Windows fix key handling of control characters in Parameters dialog so normal editing (Ctrl+C, ...) works. Bug #3459345.
* Fix SciTE bug where files became read-only after saving. Drop the "*" dirty marker after save completes. Bug #3467432.
* For SciTE handling of diffs with "+++" and "---" lines, also handle case where not followed by tab. Go to correct line for diff "+++" message. Bug #3467143. Bug #3467178.
* SciTE on GTK+ now performs threaded actions even on GTK+ versions before 2.12.
Integrated Scintilla release 3.0.4

* Released 8 March 2012.
* SciTE scripts can create user interfaces as strips.
* SciTE can save files automatically in the background.
* Pinch zoom implemented on Cocoa.
* ECL lexer added. Feature #3488209.
* CPP lexer fixes styling after document comment keywords. Bug #3495445.
* Pascal folder improves handling of some constructs. Feature #3486385.
* XML lexer avoids entering a bad mode due to complex preprocessor instructions. Bug #3488060.
* Duplicate command is always remembered as a distinct command for undo. Bug #3495836.
* SciTE xml.auto.close.tags no longer closes with PHP code similar to <a $this-> Bug #3488067.
* Fix bug where setting an indicator for the whole document would fail. Bug #3487440.
* Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection. Bug #3496403.
* Differences between buffered and unbuffered mode on Direct2D eliminated. Bug #3495791.
* Font leading implemented for Direct2D to improve display of character blobs. Bug #3494744.
* Fractional widths used for line numbers, character markers and other situations. Bug #3494492.
* Translucent rectangles drawn using Direct2D with sharper corners. Bug #3494492.
* RGBA markers drawn sharper when centred using Direct2D. Bug #3494202.
* RGBA markers are drawn centred when taller than line. Bug #3494184.
* Image marker drawing problem fixed for markers taller than line. Bug #3493503.
* Markers are drawn horizontally off-centre based on margin type instead of dimensions. Bug #3488696.
* Fold tail markers drawn vertically centred. Feature #3488289.
* On Windows, Scintilla is more responsive in wrap mode. Bug #3487397.
* Unimportant "Gdk-CRITICAL" messages are no longer displayed. Bug #3488481.
* SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running. Bug #3480635. Bug #3486657.
* Fixed problems with multiple clicks in margin and with mouse actions combined with virtual space. Bug #3484370.
* Fixed bug with using page up and down and not returning to original line. Bug #3485669.
* Down arrow with wrapped text no longer skips lines. Bug #1776560.
* Fix problem with dwell ending immediately due to word wrap. Bug #3484416.
* Wrapped lines are rewrapped more consistently while resizing window. Bug #3484179.
* Selected line ends are highlighted more consistently. Bug #3484330.
* Fix grey background on files that use shbang to choose language. Bug #3482777.
* Fix failure messages from empty commands in SciTE. Bug #3480645.
* Redrawing reduced for some marker calls. Feature #3493530.
* Match brace and select brace commands work in SciTE output pane. Feature #3486598.
* Performing SciTE "Show Calltip" command when a calltip is already visible shows the next calltip. Feature #3487017.
* SciTE allows saving file even when file unchanged. Feature #3486654.
* SciTE allows optional use of character escapes in calltips. Feature #3495239.
* SciTE can open file:// URLs with Ctrl+Shift+O. Feature #3495389.
* Key modifiers updated for GTK+ on OS X to match upstream changes.
* SciTE hang when marking all occurrences of regular expressions fixed.
Integrated Scintilla release 3.1.0

* Released 20 April 2012.
* Animated find indicator added on Cocoa.
* Buttons can be made default in SciTE user strips.
* SciTE allows find and replace histories to be saved in session.
* Option added to allow case-insensitive selection in auto-completion lists. Bug #3516538.
* Replace \0 by complete found text in regular expressions. Feature #3510979.
* Fixed single quoted strings in bash lexer. Bug #3512208.
* Incorrect highlighting fixed in C++ lexer for continued lines. Bug #3509317.
* Hang fixed in diff lexer. Bug #3508602.
* Folding improved for SQL CASE/MERGE statement. Bug #3503277.
* Fix extra drawing of selection inside word wrap indentation. Bug #3515555.
* Fix problem with determining the last line that needs styling when drawing. Bug #3514882.
* Fix problems with drawing in margins. Bug #3514882.
* Fix printing crash when using Direct2D to display on-screen. Bug #3513946.
* Fix SciTE bug where background.*.size disabled restoration of bookmarks and positions from session. Bug #3514885.
* Fixed the Move Selected Lines command when last line does not end with a line end character. Bug #3511023.
* Fix word wrap indentation printing to use printer settings instead of screen settings. Bug #3512961.
* Fix SciTE bug where executing an empty command prevented executing further commands Bug #3512976.
* Fix SciTE bugs with focus in user strips and made strips more robust with invalid definitions.
* Suppress SciTE regular expression option when searching with find next selection. Bug #3510985.
* SciTE Find in Files command matches empty pattern to all files. Feature #3495918.
* Fix scroll with mouse wheel on GTK+. Bug #3501321.
* Fix column finding method so that tab is counted correctly. Bug #3483713.
Merge branch 'ScintillaHistoryMerge'

Conflicts:
	scintilla/Document.cxx
	scintilla/Editor.cxx
	scintilla/Editor.h
	scintilla/LineMarker.cxx
	scintilla/Style.cxx
	scintilla/Style.h
	scintilla/ViewStyle.h
	scintilla/XPM.cxx
	src/ScintillaBase.cxx
Fixed bugs after merge
* Fixed line calculation error
* Added missed lexers - fixed linker error