diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 12 | ||||
| -rw-r--r-- | src/scintilla.patch | 4 | ||||
| -rw-r--r-- | src/textadept.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile index 823de922..7e112815 100644 --- a/src/Makefile +++ b/src/Makefile @@ -100,9 +100,9 @@ sci_flags = -pedantic $(plat_flag) -DSCI_LEXER -DNDEBUG -Iscintilla/include -Isc -Ilexilla/include -Ilexilla/lexlib -Wall sci_objs = AutoComplete.o CallTip.o CaseConvert.o CaseFolder.o CellBuffer.o CharClassify.o \ - ContractionState.o Decoration.o Document.o EditModel.o Editor.o EditView.o Indicator.o KeyMap.o \ - LineMarker.o MarginView.o PerLine.o PositionCache.o RESearch.o RunStyles.o ScintillaBase.o \ - Selection.o Style.o UniConversion.o UniqueString.o ViewStyle.o XPM.o + ContractionState.o Decoration.o Document.o EditModel.o Editor.o EditView.o Geometry.o \ + Indicator.o KeyMap.o LineMarker.o MarginView.o PerLine.o PositionCache.o RESearch.o RunStyles.o \ + ScintillaBase.o Selection.o Style.o UniConversion.o UniqueString.o ViewStyle.o XPM.o sci_lex_objs = Accessor.o CharacterCategory.o CharacterSet.o DefaultLexer.o LexerBase.o \ LexerModule.o LexerNoExceptions.o LexerSimple.o PropSetSimple.o StyleContext.o WordList.o sci_lexer_objs = LexLPeg.o LexLPeg-curses.o @@ -344,10 +344,10 @@ else gtdialog_url = $(root_url)/gtdialog/archive/default.zip endif -scintilla_tgz = scintilla500.tgz +scintilla_tgz = scintilla501.tgz lexilla_tgz = lexilla500.tgz -scinterm_zip = 2d933ee889151de637853ba606b92a5c2ad433a1.zip -scintillua_zip = 8584c7d1f067b514cfcee0a253be7554ee63aeac.zip +scinterm_zip = 829b0b17c019b5dc5c52470ab10527642027f4b0.zip +scintillua_zip = 530a3eb4303745c40aaaf7c3a36e39173688f9af.zip lua_tgz = lua-5.4.2.tar.gz lpeg_tgz = lpeg-1.0.2.tar.gz lfs_zip = v1_8_0.zip diff --git a/src/scintilla.patch b/src/scintilla.patch index 751c96af..5c4090bd 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -1,6 +1,6 @@ Scintilla changes: -* Hijack SCI_LOADLEXERLIBRARY for programmatically setting input method. +* Hijack SCI_CHANGEINSERTION for programmatically setting input method. This is helpful on newer versions of macOS, where changing the input method is flaky. * Handle leading whitespace in XPM images in order to prevent crashes. @@ -12,7 +12,7 @@ diff -r 6e368ee248e4 gtk/ScintillaGTK.cxx case SCI_GETDIRECTPOINTER: return reinterpret_cast<sptr_t>(this); -+ case SCI_LOADLEXERLIBRARY: ++ case SCI_CHANGEINSERTION: + // Hijack this interface to programmatically set input method. + gtk_im_multicontext_set_context_id(GTK_IM_MULTICONTEXT(im_context), ConstCharPtrFromSPtr(lParam)); + break; diff --git a/src/textadept.c b/src/textadept.c index dc671d3a..1e8a1c2b 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -1116,8 +1116,8 @@ static int call_scintilla( case SCI_GETDIRECTFUNCTION: case SCI_SETDOCPOINTER: case SCI_CHANGELEXERSTATE: ltype = SINT; break; - case SCI_SETLEXERLANGUAGE: - case SCI_LOADLEXERLIBRARY: ltype = SSTRING; break; + case SCI_SETILEXER: + case SCI_CREATELOADER: ltype = SSTRING; break; case SCI_GETNAMEDSTYLES: ltype = SSTRING, rtype = SINDEX; break; default: ltype = SSTRINGRET; } |