aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/.buffer.luadoc7
-rw-r--r--src/Makefile2
2 files changed, 5 insertions, 4 deletions
diff --git a/core/.buffer.luadoc b/core/.buffer.luadoc
index 6cb67105..d5cfd084 100644
--- a/core/.buffer.luadoc
+++ b/core/.buffer.luadoc
@@ -200,9 +200,8 @@
-- A line caret.
-- * `buffer.CARETSTYLE_BLOCK`
-- A block caret.
--- * `buffer.CARETSTYLE_OVERSTRIKE_BLOCK`
--- A block caret for overtype mode. (Needs to be bit-wise ORed with another
--- caret style.)
+-- * `buffer.CARETSTYLE_BLOCK_ALWAYS`
+-- A block caret in both insert and overtype mode.
--
-- The default value is `buffer.CARETSTYLE_LINE`.
-- @field caret_width (number)
@@ -2863,6 +2862,7 @@ function toggle_caret_sticky(buffer) end
-- are hidden).
-- @param buffer A buffer.
-- @param line The line number in *buffer* to toggle the fold on.
+-- @see set_default_fold_display_text
function toggle_fold(buffer, line) end
---
@@ -3162,6 +3162,7 @@ function set_theme(buffer, name, props) end
-- * automatic_fold
-- * call_tip_back
-- * call_tip_fore
+-- * character_category_optimization
-- * character_pointer
-- * code_page
-- * command_events
diff --git a/src/Makefile b/src/Makefile
index 02416523..2207ee67 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -364,7 +364,7 @@ else
gtdialog_url = http://foicica.com/hg/gtdialog/archive/tip.zip
endif
-scintilla_zip = 42f8114a9e00.zip
+scintilla_zip = ff65f37949a5.zip
lua_tgz = lua-5.3.5.tar.gz
lpeg_tgz = lpeg-1.0.2.tar.gz
lfs_zip = v1_7_0_2.zip