aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2020-03-29 20:27:33 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2020-03-29 20:27:33 -0400
commit5dd2cae040b48ef2b5e80e2fb12524a923dac967 (patch)
treefa6f8d46f53296eb47aae5795ef8f6c00ddba57d
parentb4b6a054d5a81054649762f6399d7024e1af66ff (diff)
downloadtextadept-5dd2cae040b48ef2b5e80e2fb12524a923dac967.tar.gz
textadept-5dd2cae040b48ef2b5e80e2fb12524a923dac967.zip
Updated to latest Scintilla to fix embedded lexer issue.
This fixes PHP, Django, and other lexers that embed themselves.
-rwxr-xr-xscripts/gen_iface.lua7
-rw-r--r--src/Makefile2
2 files changed, 1 insertions, 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