From 0b3df679ea94bdb70dc76ac54dd3255431783d07 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Tue, 7 Jan 2020 18:57:13 -0500 Subject: Updated scintilla.patch based on latest Scintilla LongTerm3 hg. --- src/scintilla.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/scintilla.patch') diff --git a/src/scintilla.patch b/src/scintilla.patch index 9569e577..e5b76b97 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -24,17 +24,14 @@ flaky. diff -r 6e368ee248e4 gtk/ScintillaGTK.cxx --- a/gtk/ScintillaGTK.cxx Fri Oct 26 11:06:34 2018 -0400 +++ b/gtk/ScintillaGTK.cxx Sun Nov 25 00:20:58 2018 -0500 -@@ -821,11 +821,11 @@ +@@ -821,6 +821,11 @@ case SCI_GETDIRECTPOINTER: return reinterpret_cast(this); --#ifdef SCI_LEXER - case SCI_LOADLEXERLIBRARY: -- LexerManager::GetInstance()->Load(ConstCharPtrFromSPtr(lParam)); ++ case SCI_LOADLEXERLIBRARY: + // Hijack this interface to programmatically set input method. + gtk_im_multicontext_set_context_id(GTK_IM_MULTICONTEXT(im_context), ConstCharPtrFromSPtr(lParam)); - break; --#endif ++ break; + case SCI_TARGETASUTF8: return TargetAsUTF8(CharPtrFromSPtr(lParam)); -- cgit v1.2.3