You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/2506
-- Commit Summary --
* Update Scintilla to version 3.20.0
-- File Changes --
M scintilla/Makefile.am (1) M scintilla/gtk/Converter.h (5) M scintilla/gtk/PlatGTK.cxx (111) M scintilla/gtk/ScintillaGTK.cxx (140) M scintilla/gtk/ScintillaGTK.h (11) M scintilla/gtk/ScintillaGTKAccessible.cxx (9) M scintilla/gtk/ScintillaGTKAccessible.h (2) A scintilla/include/Compat.h (70) M scintilla/include/ILexer.h (9) M scintilla/include/Makefile.am (1) M scintilla/include/Platform.h (14) M scintilla/include/SciLexer.h (72) M scintilla/include/Scintilla.h (55) M scintilla/include/Scintilla.iface (862) M scintilla/lexers/LexAbaqus.cxx (2) M scintilla/lexers/LexAsm.cxx (21) M scintilla/lexers/LexBash.cxx (7) M scintilla/lexers/LexBasic.cxx (15) M scintilla/lexers/LexBatch.cxx (835) M scintilla/lexers/LexCPP.cxx (79) M scintilla/lexers/LexCmake.cxx (5) M scintilla/lexers/LexD.cxx (6) M scintilla/lexers/LexHTML.cxx (62) M scintilla/lexers/LexHaskell.cxx (9) M scintilla/lexers/LexLaTeX.cxx (16) M scintilla/lexers/LexMatlab.cxx (2) M scintilla/lexers/LexPerl.cxx (41) M scintilla/lexers/LexProps.cxx (18) M scintilla/lexers/LexPython.cxx (94) M scintilla/lexers/LexR.cxx (2) M scintilla/lexers/LexRuby.cxx (6) M scintilla/lexers/LexRust.cxx (7) M scintilla/lexers/LexSQL.cxx (17) M scintilla/lexers/LexTCL.cxx (5) M scintilla/lexers/LexVerilog.cxx (6) A scintilla/lexlib/CatalogueModules.h (70) M scintilla/lexlib/CharacterCategory.cxx (163) M scintilla/lexlib/CharacterCategory.h (2) M scintilla/lexlib/CharacterSet.h (4) M scintilla/lexlib/DefaultLexer.cxx (20) M scintilla/lexlib/DefaultLexer.h (10) M scintilla/lexlib/LexerBase.cxx (21) M scintilla/lexlib/LexerBase.h (6) M scintilla/lexlib/LexerModule.h (8) M scintilla/lexlib/LexerSimple.cxx (8) M scintilla/lexlib/LexerSimple.h (3) M scintilla/lexlib/OptionSet.h (15) M scintilla/lexlib/PropSetSimple.cxx (4) M scintilla/lexlib/PropSetSimple.h (2) M scintilla/lexlib/StyleContext.h (4) M scintilla/lexlib/SubStyles.h (12) M scintilla/lexlib/WordList.cxx (38) M scintilla/lexlib/WordList.h (2) M scintilla/scintilla_changes.patch (6) M scintilla/src/AutoComplete.h (4) M scintilla/src/CallTip.cxx (242) M scintilla/src/CallTip.h (35) M scintilla/src/CaseConvert.cxx (19) M scintilla/src/CaseConvert.h (2) M scintilla/src/CaseFolder.cxx (4) M scintilla/src/CaseFolder.h (4) M scintilla/src/Catalogue.cxx (38) M scintilla/src/CellBuffer.cxx (99) M scintilla/src/CellBuffer.h (52) M scintilla/src/CharClassify.cxx (2) M scintilla/src/CharClassify.h (4) M scintilla/src/ContractionState.cxx (30) M scintilla/src/Decoration.cxx (14) M scintilla/src/Document.cxx (211) M scintilla/src/Document.h (96) M scintilla/src/EditModel.cxx (3) M scintilla/src/EditModel.h (3) M scintilla/src/EditView.cxx (119) M scintilla/src/EditView.h (2) M scintilla/src/Editor.cxx (347) M scintilla/src/Editor.h (55) M scintilla/src/ExternalLexer.cxx (106) M scintilla/src/ExternalLexer.h (58) M scintilla/src/Indicator.cxx (11) M scintilla/src/Indicator.h (8) M scintilla/src/KeyMap.cxx (4) M scintilla/src/KeyMap.h (6) M scintilla/src/LineMarker.cxx (624) M scintilla/src/LineMarker.h (2) M scintilla/src/MarginView.cxx (2) M scintilla/src/Partitioning.h (38) M scintilla/src/PerLine.cxx (135) M scintilla/src/PerLine.h (31) M scintilla/src/Position.h (5) M scintilla/src/PositionCache.cxx (23) M scintilla/src/PositionCache.h (2) M scintilla/src/RESearch.cxx (26) M scintilla/src/RESearch.h (26) M scintilla/src/RunStyles.cxx (8) M scintilla/src/ScintillaBase.cxx (47) M scintilla/src/ScintillaBase.h (5) M scintilla/src/Selection.cxx (76) M scintilla/src/Selection.h (101) M scintilla/src/SparseVector.h (103) M scintilla/src/SplitVector.h (8) M scintilla/src/Style.cxx (10) M scintilla/src/Style.h (11) M scintilla/src/UniConversion.h (8) M scintilla/src/UniqueString.cxx (6) M scintilla/src/UniqueString.h (4) M scintilla/src/ViewStyle.cxx (29) M scintilla/src/ViewStyle.h (2) M scintilla/src/XPM.cxx (37) M scintilla/src/XPM.h (28) M scintilla/version.txt (2)
-- Patch Links --
https://github.com/geany/geany/pull/2506.patch https://github.com/geany/geany/pull/2506.diff
eht16:scintilla/update-3-20-0 solved problem[#2518](https://github.com/geany/geany/issues/2518). Thanks everyone.
@eht16, maybe you can try to update up to 3.21.0?
Yeah, will do soon. Thanks for the reminder.
Updated this PR to contain the update to Scintilla 3.21.0.
Thanks! I tried yesterday, works fine.
WFM LM20 GTK3.
Oh, 3.21.1 just released and is probably the last 3.x, maybe just jump straight to it.
FWIW i have a local branch with scintilla 4, looking good
FWIW i have a local branch with scintilla 4, looking good
Since Scintilla 5 with API changes is likely the next release, it is probably best for Geany itself to skip version 4 and go straight to version 5 since (IIUC) there will be no changes of dependencies or required compiler versions between those two. And any changes you have made for version 4 will hopefully be useful for Scintilla version 5.
Not sure why we should skip 4 just because 5 comes soon. That doesn't mean we have to make a release containing 4 though, but we can gather experience in preparation for 5.
In my local branch scintilla 4 required no changes to Geany itself so it's a no-brainer.
On the other hand, nobody knows for sure when 5 will be released, so why artificially wait?
On the other hand, nobody knows for sure when 5 will be released, so why artificially wait?
I don't mind if we wait for 5 or just upgrade to 4. But we should still update Scintilla 3.x in current master and get it released. Afterwards, an upgrade to 4 or 5 is perfectly fine. I just want to get a new release with the current 3.x release for users with old compilers (if there are any at all).
That's fine with me
Updated this PR to contain the update to Scintilla 3.21.1.
Agree with @eht16 that we should merge this PR, and since I just installed a new Linux version and had to rebuild Geany, I also tested this PR and posted that it WFM, but then noticed 3.21.1 was released. So I suggest updating this to 3.21.1 if its to be the last "old compiler" release [Note: @eht16 pushed 3.21.1 while I was typing :) ].
There should be a release containing 3.21.1 so any old compiler users left have a defined last version and tarballs etc
@kugel- if Scintilla version 4 actually needs no changes to Geany then I agree that if a PR for it materialises after the release with Scintilla 3.21.1 but before stable Scintilla 5 (Neil has said some early releases of 5 will be unstable IIRC) is available then for sure Scintilla 4 can be included. I just didn't think it was a good use of our limited resources if Scintilla 4 needed work and then Scintilla 5 needed work.
If there are no objections, I will merge on September 26th.
Merged #2506 into master.
github-comments@lists.geany.org