scintilla/scintilla_changes.patch

   1 A patch to Scintilla 3.54 containing our changes to Scintilla
   2 (removing unused lexers, exporting symbols, and an updated marshallers file).
   3 diff --git scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx
   4 index 0871ca2..49dc278 100644
   5 --- scintilla/gtk/ScintillaGTK.cxx
   6 +++ scintilla/gtk/ScintillaGTK.cxx
   7 @@ -3046,11 +3046,13 @@ sptr_t ScintillaGTK::DirectFunction(
   8  }
   9
  10  /* legacy name for scintilla_object_send_message */
  11 +GEANY_API_SYMBOL
  12  sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
  13         ScintillaGTK *psci = static_cast<ScintillaGTK *>(sci->pscin);
  14         return psci->WndProc(iMessage, wParam, lParam);
  15  }
  16
  17 +GEANY_API_SYMBOL
  18  gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
  19         return scintilla_send_message(sci, iMessage, wParam, lParam);
  20  }
  21 @@ -3062,6 +3064,7 @@ extern void Platform_Initialise();
  22  extern void Platform_Finalise();
  23
  24  /* legacy name for scintilla_object_get_type */
  25 +GEANY_API_SYMBOL
  26  GType scintilla_get_type() {
  27         static GType scintilla_type = 0;
  28         try {
  29 @@ -3091,6 +3094,7 @@ GType scintilla_get_type() {
  30         return scintilla_type;
  31  }
  32
  33 +GEANY_API_SYMBOL
  34  GType scintilla_object_get_type() {
  35         return scintilla_get_type();
  36  }
  37 @@ -3200,6 +3204,7 @@ static void scintilla_init(ScintillaObje
  38  }
  39
  40  /* legacy name for scintilla_object_new */
  41 +GEANY_API_SYMBOL
  42  GtkWidget* scintilla_new() {
  43         GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
  44         gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
  45 @@ -3207,6 +3212,7 @@ GtkWidget* scintilla_new() {
  46         return widget;
  47  }
  48
  49 +GEANY_API_SYMBOL
  50  GtkWidget *scintilla_object_new() {
  51         return scintilla_new();
  52  }
  53 @@ -3250,6 +3250,7 @@ void scintilla_release_resources(void) {
  54  static void *copy_(void *src) { return src; }
  55  static void free_(void *doc) { }
  56
  57 +GEANY_API_SYMBOL
  58  GType scnotification_get_type(void) {
  59         static gsize type_id = 0;
  60         if (g_once_init_enter(&type_id)) {
  61 diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx
  62 index ed47aa8..e58f1ab 100644
  63 --- scintilla/src/Catalogue.cxx
  64 +++ scintilla/src/Catalogue.cxx
  65 @@ -77,121 +77,50 @@ int Scintilla_LinkLexers() {
  66
  67  //++Autogenerated -- run scripts/LexGen.py to regenerate
  68  //**\(\tLINK_LEXER(\*);\n\)
  69 -       LINK_LEXER(lmA68k);
  70         LINK_LEXER(lmAbaqus);
  71         LINK_LEXER(lmAda);
  72 -       LINK_LEXER(lmAPDL);
  73 -       LINK_LEXER(lmAs);
  74         LINK_LEXER(lmAsm);
  75 -       LINK_LEXER(lmAsn1);
  76 -       LINK_LEXER(lmASY);
  77 -       LINK_LEXER(lmAU3);
  78 -       LINK_LEXER(lmAVE);
  79 -       LINK_LEXER(lmAVS);
  80 -       LINK_LEXER(lmBaan);
  81         LINK_LEXER(lmBash);
  82         LINK_LEXER(lmBatch);
  83 -       LINK_LEXER(lmBibTeX);
  84 -       LINK_LEXER(lmBlitzBasic);
  85 -       LINK_LEXER(lmBullant);
  86         LINK_LEXER(lmCaml);
  87 -       LINK_LEXER(lmClw);
  88 -       LINK_LEXER(lmClwNoCase);
  89         LINK_LEXER(lmCmake);
  90         LINK_LEXER(lmCOBOL);
  91         LINK_LEXER(lmCoffeeScript);
  92 -       LINK_LEXER(lmConf);
  93         LINK_LEXER(lmCPP);
  94 -       LINK_LEXER(lmCPPNoCase);
  95 -       LINK_LEXER(lmCsound);
  96         LINK_LEXER(lmCss);
  97         LINK_LEXER(lmD);
  98         LINK_LEXER(lmDiff);
  99 -       LINK_LEXER(lmDMAP);
 100 -       LINK_LEXER(lmDMIS);
 101 -       LINK_LEXER(lmECL);
 102 -       LINK_LEXER(lmEiffel);
 103 -       LINK_LEXER(lmEiffelkw);
 104         LINK_LEXER(lmErlang);
 105 -       LINK_LEXER(lmErrorList);
 106 -       LINK_LEXER(lmESCRIPT);
 107         LINK_LEXER(lmF77);
 108 -       LINK_LEXER(lmFlagShip);
 109         LINK_LEXER(lmForth);
 110         LINK_LEXER(lmFortran);
 111         LINK_LEXER(lmFreeBasic);
 112 -       LINK_LEXER(lmGAP);
 113 -       LINK_LEXER(lmGui4Cli);
 114         LINK_LEXER(lmHaskell);
 115         LINK_LEXER(lmHTML);
 116 -       LINK_LEXER(lmIHex);
 117 -       LINK_LEXER(lmInno);
 118 -       LINK_LEXER(lmJSON);
 119 -       LINK_LEXER(lmKix);
 120 -       LINK_LEXER(lmKVIrc);
 121         LINK_LEXER(lmLatex);
 122         LINK_LEXER(lmLISP);
 123 -       LINK_LEXER(lmLiterateHaskell);
 124 -       LINK_LEXER(lmLot);
 125 -       LINK_LEXER(lmLout);
 126         LINK_LEXER(lmLua);
 127 -       LINK_LEXER(lmMagikSF);
 128         LINK_LEXER(lmMake);
 129         LINK_LEXER(lmMarkdown);
 130 -       LINK_LEXER(lmMatlab);
 131 -       LINK_LEXER(lmMETAPOST);
 132 -       LINK_LEXER(lmMMIXAL);
 133 -       LINK_LEXER(lmModula);
 134 -       LINK_LEXER(lmMSSQL);
 135 -       LINK_LEXER(lmMySQL);
 136 -       LINK_LEXER(lmNimrod);
 137 -       LINK_LEXER(lmNncrontab);
 138 +       // We use Octave instead of Matlab
 139         LINK_LEXER(lmNsis);
 140         LINK_LEXER(lmNull);
 141         LINK_LEXER(lmOctave);
 142 -       LINK_LEXER(lmOpal);
 143 -       LINK_LEXER(lmOScript);
 144         LINK_LEXER(lmPascal);
 145 -       LINK_LEXER(lmPB);
 146         LINK_LEXER(lmPerl);
 147         LINK_LEXER(lmPHPSCRIPT);
 148 -       LINK_LEXER(lmPLM);
 149         LINK_LEXER(lmPO);
 150 -       LINK_LEXER(lmPOV);
 151 -       LINK_LEXER(lmPowerPro);
 152         LINK_LEXER(lmPowerShell);
 153 -       LINK_LEXER(lmProgress);
 154         LINK_LEXER(lmProps);
 155 -       LINK_LEXER(lmPS);
 156 -       LINK_LEXER(lmPureBasic);
 157         LINK_LEXER(lmPython);
 158         LINK_LEXER(lmR);
 159 -       LINK_LEXER(lmREBOL);
 160 -       LINK_LEXER(lmRegistry);
 161         LINK_LEXER(lmRuby);
 162         LINK_LEXER(lmRust);
 163 -       LINK_LEXER(lmScriptol);
 164 -       LINK_LEXER(lmSmalltalk);
 165 -       LINK_LEXER(lmSML);
 166 -       LINK_LEXER(lmSorc);
 167 -       LINK_LEXER(lmSpecman);
 168 -       LINK_LEXER(lmSpice);
 169         LINK_LEXER(lmSQL);
 170 -       LINK_LEXER(lmSrec);
 171 -       LINK_LEXER(lmSTTXT);
 172 -       LINK_LEXER(lmTACL);
 173 -       LINK_LEXER(lmTADS3);
 174 -       LINK_LEXER(lmTAL);
 175         LINK_LEXER(lmTCL);
 176 -       LINK_LEXER(lmTCMD);
 177 -       LINK_LEXER(lmTEHex);
 178 -       LINK_LEXER(lmTeX);
 179         LINK_LEXER(lmTxt2tags);
 180 -       LINK_LEXER(lmVB);
 181 -       LINK_LEXER(lmVBScript);
 182         LINK_LEXER(lmVerilog);
 183         LINK_LEXER(lmVHDL);
 184 -       LINK_LEXER(lmVisualProlog);
 185         LINK_LEXER(lmXML);
 186         LINK_LEXER(lmYAML);
 187