From 5dd2cae040b48ef2b5e80e2fb12524a923dac967 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Sun, 29 Mar 2020 20:27:33 -0400
Subject: Updated to latest Scintilla to fix embedded lexer issue. This fixes
 PHP, Django, and other lexers that embed themselves.

---
 scripts/gen_iface.lua | 7 -------
 src/Makefile          | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/scripts/gen_iface.lua b/scripts/gen_iface.lua
index bb520035..f8386e84 100755
--- a/scripts/gen_iface.lua
+++ b/scripts/gen_iface.lua
@@ -158,13 +158,6 @@ properties['annotation_style_offset'][3] = types.index
 properties['main_selection'][3] = types.index
 functions['position_relative'][4] = types.int
 
--- Awaiting upstream Scintilla patch. Once applied, these should be removed.
-functions['marker_line_from_handle'][2] = types.index
-functions['call_tip_set_hlt'][3] = types.index
-functions['call_tip_set_hlt'][4] = types.index
-functions['indicator_start'][2] = types.index
-functions['indicator_end'][2] = types.index
-
 -- Add mouse events from Scintilla curses manually.
 constants[#constants + 1] = 'MOUSE_PRESS=1'
 constants[#constants + 1] = 'MOUSE_DRAG=2'
diff --git a/src/Makefile b/src/Makefile
index dd310bad..345fd494 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -374,7 +374,7 @@ else
   gtdialog_url = http://foicica.com/hg/gtdialog/archive/tip.zip
 endif
 
-scintilla_zip = d5675dbd273d.zip
+scintilla_zip = faaabc636de6.zip
 lua_tgz = lua-5.3.5.tar.gz
 lpeg_tgz = lpeg-1.0.2.tar.gz
 lfs_zip = v1_7_0_2.zip
-- 
cgit v1.2.3