diff options
| -rw-r--r-- | core/events.lua | 6 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/scintilla.patch | 30 |
3 files changed, 7 insertions, 31 deletions
diff --git a/core/events.lua b/core/events.lua index 6dedc879..cf9f637b 100644 --- a/core/events.lua +++ b/core/events.lua @@ -123,6 +123,8 @@ local M = {} -- @field HOTSPOT_CLICK (string) -- Emitted when clicking on text that is in a style that has the hotspot -- attribute set. +-- Event handlers should avoid calling any function that modifies the current +-- selection or caret position. -- Arguments: -- -- * _`position`_: The clicked text's position. @@ -134,6 +136,8 @@ local M = {} -- @field HOTSPOT_DOUBLE_CLICK (string) -- Emitted when double-clicking on text that is in a style that has the -- hotspot attribute set. +-- Event handlers should avoid calling any function that modifies the current +-- selection or caret position. -- Arguments: -- -- * _`position`_: The double-clicked text's position. @@ -145,6 +149,8 @@ local M = {} -- @field HOTSPOT_RELEASE_CLICK (string) -- Emitted when releasing the mouse after clicking on text that is in a style -- that has the hotspot attribute set. +-- Event handlers should avoid calling any function that modifies the current +-- selection or caret position. -- Arguments: -- -- * _`position`_: The clicked text's position. diff --git a/src/Makefile b/src/Makefile index fc907553..cd7761e9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -375,7 +375,7 @@ else lspawn_url = http://foicica.com/hg/lspawn/archive/tip.zip endif -scintilla_tgz = scintilla352.tgz +scintilla_tgz = scintilla353.tgz scinterm_zip = scinterm_1.5.zip scintillua_zip = scintillua_3.5.2-1.zip lua_tgz = lua-5.2.3.tar.gz diff --git a/src/scintilla.patch b/src/scintilla.patch index f2d7935d..3b30a825 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -18,33 +18,3 @@ diff -r 5693714a8b0b src/Catalogue.cxx return 1; } -diff -r 326449de45d0 src/ScintillaBase.cxx ---- a/src/ScintillaBase.cxx Thu Sep 25 09:48:50 2014 +1000 -+++ b/src/ScintillaBase.cxx Sun Nov 30 23:25:36 2014 -0500 -@@ -448,12 +448,12 @@ - PRectangle rcClient = GetClientRectangle(); - int offset = vs.lineHeight + static_cast<int>(rc.Height()); - // adjust so it displays above the text. -- if (rc.bottom > rcClient.bottom) { -+ if (rc.bottom > rcClient.bottom && rc.Height() < rcClient.Height()) { - rc.top -= offset; - rc.bottom -= offset; - } - // adjust so it displays below the text. -- if (rc.top < rcClient.top) { -+ if (rc.top < rcClient.top && rc.Height() < rcClient.Height()) { - rc.top += offset; - rc.bottom += offset; - } -diff -r a797ff255bdf src/Editor.cxx ---- a/src/Editor.cxx Sat Nov 29 12:42:58 2014 +1100 -+++ b/src/Editor.cxx Wed Dec 17 09:54:10 2014 -0500 -@@ -3998,7 +3998,7 @@ - // Really means: "Point in a margin" - if (vs.fixedColumnWidth > 0) { // There is a margin - PRectangle rcSelMargin = GetClientRectangle(); -- rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart - vs.leftMarginWidth); -+ rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart - (vs.leftMarginWidth > 0 ? vs.leftMarginWidth : 1)); - rcSelMargin.left = static_cast<XYPOSITION>(vs.textStart - vs.fixedColumnWidth); - return rcSelMargin.Contains(pt); - } else { |