> Here are the current patches, with all the discussed suggestions
> integrated (IIRC), and Scintilla updated to its latest release.

LGTM! Please push to master. Thanks.