Hi,
I have upgraded my working copy of Geany to use Scintilla 2.25. Attached are patches of the upgrade[1] (*massive patch*) and the application of my Scintilla patches[2] which were later merged upstream.
IIRC part of the scintilla_changes.patch didn't work (the Catalogue.cxx part), so I hand edited it.
So far the upgrade is smooth...
[1] https://github.com/codebrainz/geany/commit/8cb68e93b0cb5b56d8327d073ad665ddf... [2] https://github.com/codebrainz/geany/commit/35023b448a9b76fbf8422d8c5a9a417ef...
Cheers, Matthew Brush