From 75041aa1e1651841073473399397bcbfc10b0134 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+orbitalquark@users.noreply.github.com> Date: Sun, 13 Sep 2020 00:11:18 -0400 Subject: Switch back to Scintilla default (4.x), Scinterm, and Scintillua. Scintilla LongTerm3 maintenance is ending with upcoming Scintilla 5. Textadept now requires a C++17 compiler. Also updated Docker image. --- src/scintilla.patch | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/scintilla.patch') diff --git a/src/scintilla.patch b/src/scintilla.patch index 9a525ae0..5a4541b2 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -1,30 +1,9 @@ Scintilla changes: -Only link the LPeg lexer. - Hijack SCI_LOADLEXERLIBRARY for programmatically setting input method. This is helpful on newer versions of macOS, where changing the input method is flaky. ---- a/src/Catalogue.cxx Fri Dec 06 16:19:52 2013 +1100 -+++ b/src/Catalogue.cxx Sun Dec 15 21:21:20 2013 -0500 -@@ -74,6 +74,7 @@ - // Shorten the code that declares a lexer and ensures it is linked in by calling a method. - #define LINK_LEXER(lexer) extern LexerModule lexer; Catalogue::AddLexerModule(&lexer); - -+#if 0 - //++Autogenerated -- run scripts/LexGen.py to regenerate - //**\(\tLINK_LEXER(\*);\n\) - LINK_LEXER(lmA68k); -@@ -187,6 +188,8 @@ - LINK_LEXER(lmYAML); - - //--Autogenerated -- end of automatically generated section -+#endif -+ LINK_LEXER(lmLPeg); - - return 1; - } diff -r 6e368ee248e4 gtk/ScintillaGTK.cxx --- a/gtk/ScintillaGTK.cxx Fri Oct 26 11:06:34 2018 -0400 +++ b/gtk/ScintillaGTK.cxx Sun Nov 25 00:20:58 2018 -0500 -- cgit v1.2.3