upgraded to Scintilla 5.1.3 and Scinterm 3.1

* Previous Scintilla version was 3.6.4 and Scinterm was 1.7 (with lots of custom patches).
  All of the patches are now either irrelevant or have been merged upstream.
* Since Scintilla 5 requires C++17, this increases the minimum GCC version at least
  to 5.0. We may actually require even newer versions.
* I could not upgrade the scintilla-mirror (which was imported from Mercurial),
  so the old sciteco-dev branch was renamed to sciteco-dev-pre-v2.0.0,
  master was deleted and I reimported the entire Scintilla repo using
  git-remote-hg.
  This means that scintilla-mirror now contains two entirely separate trees.
  But it is still possible to clone old SciTECO repos.
* The strategy/workflow of maintaining hotfix branches on scintilla-mirror has been changed.
  Instead of having one sciteco-dev branch that is rebased onto new Scintilla upstream
  releases and tagging SciTECO releases in scintilla-mirror (to keep the commits referenced),
  we now create a branch for every Scintilla version we are based on (eg. sciteco-rel-5-1-3).
  This branch is never rebased or deleted. Therefore, we are guaranteed to be able to
  clone arbitrary SciTECO repo commits - not only releases.
  Releases no longer have to be tagged in scintilla-mirror.
  On the downside, fixup commits may accumulate in these new branches.
  They can only be squashed once a new branch for a new Scintilla release is created
  (e.g. by cherry-picking followed by rebase).
* Scinterm does no longer have to reside in the Scintilla subdirectory,
  so we added it as a regular submodule.
  There are no more recursive submodules.
  The Scinterm build system has not been improved at all, but we use
  a trick based on VPATH to build Scinterm in scintilla/bin/.
* Scinterm is now in Git and we reference the upstream repo for the
  time being.
  We might mirror it and apply the same branching workflow as with Scintilla
  if necessary.
  The scinterm-mirror repository still exists but has not been touched.
  We will also have to rewrite its master branch as it was a non-reproducible
  Mercurial import.
* Scinterm now also comes with patches for Scintilla which we simply applied
  on our sciteco-rel-5-1-3 branch.
* Scintilla 5 outsourced its lexers into the Lexilla project.
  We added it as yet another submodule.
* All submodules have been moved into contrib/.
* The Scintilla API for setting lexers has consequently changed.
  We now have to call SCI_SETILEXER(0, CreateLexer(name)).
  As I did not want to introduce a separate command for setting lexers,
  <ES> has been extended to allow setting lexers by name with the SCI_SETILEXER
  message which effectively replaces SCI_SETLEXERLANGUAGE.
* The lexer macros (SCLEX_...) no longer serve any purpose - they weren't used
  in the SciTECO standard library anyway - and have consequently been removed
  from symbols-scilexer.c.
  The style macros from SciLexer.h (SCE_...) are theoretically still useful - even
  though they are not used by our current color schemes - and have therefore been
  retained. They can be specified as wParam in <ES>.
* <ES> no longer allows symbolic constants for lParam.
  This never made any sense since all supported symbols were always wParam.
* Scinterm supports new native cursor modes.
  They are not used for the time being and the previous CARETSTYLE_BLOCK_AFTER
  caret style is configured by default.
  It makes no sense to enable native cursor modes now since the
  command line should have a native cursor but is not yet a Scintilla view.
* The Scintilla upgrade performed much worse than before,
  so some optimizations will be necessary.

72 files changed, 73 insertions, 73 deletions

diff --git a/lib/lexers/abaqus.tes b/lib/lexers/abaqus.tes
index 48f6431..a21c847 100644
--- a/lib/lexers/abaqus.tes
+++ b/lib/lexers/abaqus.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.abaqus]{
-  ESSETLEXERLANGUAGEabaqus
+  ESSETILEXERabaqus
   1ESSETKEYWORDS
     *amplitude *assembly *beam *boundary *buckle *bulk *cload *conditions
     *conductivity *contact *damping *density *dload *dsflux *dsload *dynamic *el *elastic
diff --git a/lib/lexers/ada.tes b/lib/lexers/ada.tes
index f972f15..318a1e3 100644
--- a/lib/lexers/ada.tes
+++ b/lib/lexers/ada.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.ada]{
-  ESSETLEXERLANGUAGEada
+  ESSETILEXERada
   0ESSETKEYWORDS
     abort abstract accept access aliased all array at begin body case constant
     declare delay delta digits do else elsif end entry exception exit for function
diff --git a/lib/lexers/asl.tes b/lib/lexers/asl.tes
index 342cd35..9a5888c 100644
--- a/lib/lexers/asl.tes
+++ b/lib/lexers/asl.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.asl]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     AccessAs Acquire Add Alias And Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Arg6 BankField
     Break BreakPoint Buffer Case Concatenate ConcatenateResTemplate CondRefOf
diff --git a/lib/lexers/asm.tes b/lib/lexers/asm.tes
index eab13a7..816a7e2 100644
--- a/lib/lexers/asm.tes
+++ b/lib/lexers/asm.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.asm]{
-  ESSETLEXERLANGUAGEasm
+  ESSETILEXERasm
   0ESSETKEYWORDS
     aaa aad aam aas daa das ja jae jb jbe jc jcxz je jg jge jl jle jmp jna jnae
     jnb jnbe jnc jne jng jnge jnl jnle jno jnp jns jnz jo jp jpe jpo js jz jcxz
diff --git a/lib/lexers/ave.tes b/lib/lexers/ave.tes
index 279fdde..81b72b2 100644
--- a/lib/lexers/ave.tes
+++ b/lib/lexers/ave.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.ave]{
-  ESSETLEXERLANGUAGEave
+  ESSETILEXERave
   0ESSETKEYWORDS
     nil true false else for if while then elseif end av self in exit
   :M[color.comment],1M[color.set]
diff --git a/lib/lexers/avs.tes b/lib/lexers/avs.tes
index ca652bd..935ba90 100644
--- a/lib/lexers/avs.tes
+++ b/lib/lexers/avs.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.avs]{
-  ESSETLEXERLANGUAGEavs
+  ESSETILEXERavs
   0ESSETKEYWORDS
     true false return global
   1ESSETKEYWORDS
diff --git a/lib/lexers/awk.tes b/lib/lexers/awk.tes
index e96066f..75cf3f0 100644
--- a/lib/lexers/awk.tes
+++ b/lib/lexers/awk.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.awk]{
-  ESSETLEXERLANGUAGEperl
+  ESSETILEXERperl
   0ESSETKEYWORDS
     BEGIN END if else while do for in break continue delete exit function return
     print printf sprintf system close getline next nextfile fflush atan2 cos exp int
diff --git a/lib/lexers/baan.tes b/lib/lexers/baan.tes
index 4d5b9d6..87634ca 100644
--- a/lib/lexers/baan.tes
+++ b/lib/lexers/baan.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.baan]{
-  ESSETLEXERLANGUAGEbaan
+  ESSETILEXERbaan
   :M[color.comment],1M[color.set]
   :M[color.comment],2M[color.set]
   :M[color.number],3M[color.set]
diff --git a/lib/lexers/bash.tes b/lib/lexers/bash.tes
index b66d6e3..5dce149 100644
--- a/lib/lexers/bash.tes
+++ b/lib/lexers/bash.tes
@@ -11,7 +11,7 @@
 }
 
 @[lexer.set.bash]{
-  ESSETLEXERLANGUAGEbash
+  ESSETILEXERbash
   0ESSETKEYWORDS
     alias ar asa awk banner basename bash bc bdiff break bunzip2 bzip2 cal
     calendar case cat cc cd chmod cksum clear cmp col comm compress continue cp cpio
diff --git a/lib/lexers/batch.tes b/lib/lexers/batch.tes
index 0a9890d..a3a2a80 100644
--- a/lib/lexers/batch.tes
+++ b/lib/lexers/batch.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.batch]{
-  ESSETLEXERLANGUAGEbatch
+  ESSETILEXERbatch
   0ESSETKEYWORDS
     rem set if exist errorlevel for in do break call chcp cd chdir choice cls
     country ctty date del erase dir echo exit goto loadfix loadhigh mkdir md move path
diff --git a/lib/lexers/blitzbasic.tes b/lib/lexers/blitzbasic.tes
index 3ec3037..fee1f96 100644
--- a/lib/lexers/blitzbasic.tes
+++ b/lib/lexers/blitzbasic.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.blitzbasic]{
-  ESSETLEXERLANGUAGEblitzbasic
+  ESSETILEXERblitzbasic
   0ESSETKEYWORDS
     abs accepttcpstream acos after and apptitle asc asin atan atan2
     automidhandle autosuspend availvidmem backbuffer banksize before bin calldll case ceil
diff --git a/lib/lexers/c.tes b/lib/lexers/c.tes
index 434bf14..d4aeb52 100644
--- a/lib/lexers/c.tes
+++ b/lib/lexers/c.tes
@@ -37,7 +37,7 @@
   until var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
 
 @[lexer.set.c]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     Q[lexer.c.basekeywords] _Alignas _Alignof _Atomic
     _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local
diff --git a/lib/lexers/caml.tes b/lib/lexers/caml.tes
index d7b1838..0b681a1 100644
--- a/lib/lexers/caml.tes
+++ b/lib/lexers/caml.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.caml]{
-  ESSETLEXERLANGUAGEcaml
+  ESSETILEXERcaml
   0ESSETKEYWORDS
     and as assert asr begin class constraint do done downto else end exception
     external false for fun function functor if in include inherit initializer land lazy
diff --git a/lib/lexers/ch.tes b/lib/lexers/ch.tes
index 6781659..b0a1f4d 100644
--- a/lib/lexers/ch.tes
+++ b/lib/lexers/ch.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.ch]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     auto array bool break case char class complex ComplexInf ComplexNaN const
     continue default delete do double else enum export extern float for foreach goto if
diff --git a/lib/lexers/cmake.tes b/lib/lexers/cmake.tes
index 14d5a15..3b7c5f7 100644
--- a/lib/lexers/cmake.tes
+++ b/lib/lexers/cmake.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.cmake]{
-  ESSETLEXERLANGUAGEcmake
+  ESSETILEXERcmake
   ! Commands !
   0ESSETKEYWORDS
     add_custom_command add_custom_target add_definitions add_dependencies
diff --git a/lib/lexers/cobol.tes b/lib/lexers/cobol.tes
index 3760b71..7d9b6cb 100644
--- a/lib/lexers/cobol.tes
+++ b/lib/lexers/cobol.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.cobol]{
-  ESSETLEXERLANGUAGECOBOL
+  ESSETILEXERCOBOL
   0ESSETKEYWORDS
     configuration data declaratives division environment environment-division
     file file-control function i-o i-o-control identification input input-output
diff --git a/lib/lexers/cpp.tes b/lib/lexers/cpp.tes
index d966e38..21e03d0 100644
--- a/lib/lexers/cpp.tes
+++ b/lib/lexers/cpp.tes
@@ -18,7 +18,7 @@
 }
 
 @[lexer.set.cpp]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     Q[lexer.c.basekeywords]
     and and_eq bitand bitor catch class compl const_cast constexpr delete dynamic_cast
diff --git a/lib/lexers/cs.tes b/lib/lexers/cs.tes
index 1d97053..592332a 100644
--- a/lib/lexers/cs.tes
+++ b/lib/lexers/cs.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.cs]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     abstract as ascending base bool break by byte case catch char checked class
     const continue decimal default delegate descending do double else enum equals
diff --git a/lib/lexers/d.tes b/lib/lexers/d.tes
index 1b69df3..9a00fc9 100644
--- a/lib/lexers/d.tes
+++ b/lib/lexers/d.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.d]{
-  ESSETLEXERLANGUAGEd
+  ESSETILEXERd
   0ESSETKEYWORDS
     abstract alias align asm assert auto body bool break byte case cast catch
     cdouble cent cfloat char class const continue creal dchar debug default delegate
diff --git a/lib/lexers/diff.tes b/lib/lexers/diff.tes
index ff3c6af..a254f49 100644
--- a/lib/lexers/diff.tes
+++ b/lib/lexers/diff.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.diff]{
-  ESSETLEXERLANGUAGEdiff
+  ESSETILEXERdiff
   :M[color.comment],1M[color.set]
   :M[color.keyword],2M[color.set] ! Command !
   :M[color.preproc],3M[color.set] ! Source/Dest !
diff --git a/lib/lexers/docbook.tes b/lib/lexers/docbook.tes
index cf9e3ab..ea60702 100644
--- a/lib/lexers/docbook.tes
+++ b/lib/lexers/docbook.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.docbook]{
-  ESSETLEXERLANGUAGEhypertext
+  ESSETILEXERhypertext
   0ESSETKEYWORDS
     abbrev abstract accel ackno acronym action address affiliation alt anchor
     answer appendix appendixinfo application area areaset areaspec arg article
diff --git a/lib/lexers/eiffel.tes b/lib/lexers/eiffel.tes
index af14ea0..c22f5df 100644
--- a/lib/lexers/eiffel.tes
+++ b/lib/lexers/eiffel.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.eiffel]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     struct unit integer real bool int long uint nibble byte bits bytes bit time
     string var instance event verilog vhdl on compute start expect check that routine
diff --git a/lib/lexers/f77.tes b/lib/lexers/f77.tes
index 22e7ca1..e06243c 100644
--- a/lib/lexers/f77.tes
+++ b/lib/lexers/f77.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.f77]{
-  ESSETLEXERLANGUAGEf77
+  ESSETILEXERf77
   0ESSETKEYWORDS
     access action advance allocatable allocate apostrophe assign assignment
     associate asynchronous backspace bind blank blockdata call case character class close
diff --git a/lib/lexers/f95.tes b/lib/lexers/f95.tes
index 73cc766..7544375 100644
--- a/lib/lexers/f95.tes
+++ b/lib/lexers/f95.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.f95]{
-  ESSETLEXERLANGUAGEfortran
+  ESSETILEXERfortran
   0ESSETKEYWORDS
     access action advance allocatable allocate apostrophe assign assignment
     associate asynchronous backspace bind blank blockdata call case character class close
diff --git a/lib/lexers/flagship.tes b/lib/lexers/flagship.tes
index caaf140..485d351 100644
--- a/lib/lexers/flagship.tes
+++ b/lib/lexers/flagship.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.flagship]{
-  ESSETLEXERLANGUAGEflagship
+  ESSETILEXERflagship
   0ESSETKEYWORDS
     ? @ accept access all alternate announce ansi any append as assign autolock
     average begin bell bitmap blank box call cancel case century charset checkbox clear
diff --git a/lib/lexers/flash.tes b/lib/lexers/flash.tes
index 8e9b83f..27be2bf 100644
--- a/lib/lexers/flash.tes
+++ b/lib/lexers/flash.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.flash]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     add and break case catch class continue default delete do dynamic else eq
     extends false finally for function ge get gt if implements import in instanceof
diff --git a/lib/lexers/freebasic.tes b/lib/lexers/freebasic.tes
index 2e15ed3..16b7ace 100644
--- a/lib/lexers/freebasic.tes
+++ b/lib/lexers/freebasic.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.freebasic]{
-  ESSETLEXERLANGUAGEfreebasic
+  ESSETILEXERfreebasic
   0ESSETKEYWORDS
     append as asc asin asm atan2 atn beep bin binary bit bitreset bitset bload
     bsave byref byte byval call callocate case cbyte cdbl cdecl chain chdir chr cint
diff --git a/lib/lexers/gap.tes b/lib/lexers/gap.tes
index 75985f4..7a680c7 100644
--- a/lib/lexers/gap.tes
+++ b/lib/lexers/gap.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.gap]{
-  ESSETLEXERLANGUAGEgap
+  ESSETILEXERgap
   0ESSETKEYWORDS
     and break continue do elif else end fi for function if in local mod not od
     or quit rec repeat return then until while QUIT
diff --git a/lib/lexers/go.tes b/lib/lexers/go.tes
index 8e4900b..a637b5c 100644
--- a/lib/lexers/go.tes
+++ b/lib/lexers/go.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.go]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     bool byte break case chan complex64 complex128 const continue defer default
     else for func go goto fallthrough false float32 float64 if import int interface
diff --git a/lib/lexers/gob.tes b/lib/lexers/gob.tes
index e3e1e63..0d99982 100644
--- a/lib/lexers/gob.tes
+++ b/lib/lexers/gob.tes
@@ -8,7 +8,7 @@
 }
 
 @[lexer.set.gob]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     Q[lexer.c.basekeywords] _Alignas _Alignof _Atomic
     _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local
diff --git a/lib/lexers/html.tes b/lib/lexers/html.tes
index 79b6a4a..b09012d 100644
--- a/lib/lexers/html.tes
+++ b/lib/lexers/html.tes
@@ -19,7 +19,7 @@
 }
 
 @[lexer.set.html]{
-  ESSETLEXERLANGUAGEhypertext
+  ESSETILEXERhypertext
   0ESSETKEYWORDS
     a abbr acronym address applet area b base basefont bdo big blockquote body
     br button caption center cite code col colgroup dd del dfn dir div dl dt em
diff --git a/lib/lexers/idl.tes b/lib/lexers/idl.tes
index fdfda09..9180ae0 100644
--- a/lib/lexers/idl.tes
+++ b/lib/lexers/idl.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.idl]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     aggregatable allocate appobject arrays async async_uuid auto_handle bindable
     boolean broadcast byte byte_count call_as callback char coclass code comm_status
diff --git a/lib/lexers/inno.tes b/lib/lexers/inno.tes
index ddd0e66..c963b1d 100644
--- a/lib/lexers/inno.tes
+++ b/lib/lexers/inno.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.inno]{
-  ESSETLEXERLANGUAGEinno
+  ESSETILEXERinno
   0ESSETKEYWORDS
     code components custommessages dirs files icons ini installdelete
     langoptions languages messages registry run setup types tasks uninstalldelete
diff --git a/lib/lexers/java.tes b/lib/lexers/java.tes
index 83560e5..a9a592a 100644
--- a/lib/lexers/java.tes
+++ b/lib/lexers/java.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.java]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     abstract assert boolean break byte case catch char class const continue
     default do double else enum extends final finally float for goto if implements
diff --git a/lib/lexers/js.tes b/lib/lexers/js.tes
index 5968f9c..3e8ed8e 100644
--- a/lib/lexers/js.tes
+++ b/lib/lexers/js.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.js]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     abstract boolean break byte case catch char class const continue debugger
     default delete do double else enum export extends final finally float for function
diff --git a/lib/lexers/kix.tes b/lib/lexers/kix.tes
index 21e7ec9..f63b5c5 100644
--- a/lib/lexers/kix.tes
+++ b/lib/lexers/kix.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.kix]{
-  ESSETLEXERLANGUAGEkix
+  ESSETILEXERkix
   0ESSETKEYWORDS
     ? and beep big break call cd cls color cookie1 copy debug del dim display do
     until exit flushkb for each next function endfunction get gets global go gosub
diff --git a/lib/lexers/lisp.tes b/lib/lexers/lisp.tes
index e96ed41..c17196a 100644
--- a/lib/lexers/lisp.tes
+++ b/lib/lexers/lisp.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.lisp]{
-  ESSETLEXERLANGUAGElisp
+  ESSETILEXERlisp
   0ESSETKEYWORDS
     not defun + - * / = < > <= >= princ eval apply funcall quote identity
     function complement backquote lambda set setq setf defun defmacro gensym make symbol
diff --git a/lib/lexers/lout.tes b/lib/lexers/lout.tes
index cdadf02..cb161b7 100644
--- a/lib/lexers/lout.tes
+++ b/lib/lexers/lout.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.lout]{
-  ESSETLEXERLANGUAGElout
+  ESSETILEXERlout
   0ESSETKEYWORDS
     @OptGall @FontDef @Family @Face @Name @Metrics @ExtraMetrics @Mapping
     @Recode @Filter @FilterIn @FilterOut @FilterErr @Common @Rump @Meld @Insert @OneOf
diff --git a/lib/lexers/lua.tes b/lib/lexers/lua.tes
index 0330414..f0eeca4 100644
--- a/lib/lexers/lua.tes
+++ b/lib/lexers/lua.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.lua]{
-  ESSETLEXERLANGUAGElua
+  ESSETILEXERlua
   0ESSETKEYWORDS
     and break do else elseif end for function if in local nil not or repeat
     return then until while false true goto
diff --git a/lib/lexers/make.tes b/lib/lexers/make.tes
index eb5c383..2e1d661 100644
--- a/lib/lexers/make.tes
+++ b/lib/lexers/make.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.make]{
-  ESSETLEXERLANGUAGEmakefile
+  ESSETILEXERmakefile
   :M[color.comment],1M[color.set]
   :M[color.preproc],2M[color.set]
   :M[color.variable],3M[color.set]
diff --git a/lib/lexers/mako.tes b/lib/lexers/mako.tes
index 381f380..5cbf9fd 100644
--- a/lib/lexers/mako.tes
+++ b/lib/lexers/mako.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.mako]{
-  ESSETLEXERLANGUAGEhypertext
+  ESSETILEXERhypertext
   0ESSETKEYWORDS
     a abbr acronym address applet area b base basefont bdo big blockquote body
     br button caption center cite code col colgroup dd del dfn dir div dl dt em
diff --git a/lib/lexers/matlab.tes b/lib/lexers/matlab.tes
index 3ad4d4c..d63a6f8 100644
--- a/lib/lexers/matlab.tes
+++ b/lib/lexers/matlab.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.matlab]{
-  ESSETLEXERLANGUAGEmatlab
+  ESSETILEXERmatlab
   0ESSETKEYWORDS
     break case catch continue else elseif end for function global if otherwise
     persistent return switch try while
diff --git a/lib/lexers/mmixal.tes b/lib/lexers/mmixal.tes
index ff54ba8..7f7df43 100644
--- a/lib/lexers/mmixal.tes
+++ b/lib/lexers/mmixal.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.mmixal]{
-  ESSETLEXERLANGUAGEmmixal
+  ESSETILEXERmmixal
   0ESSETKEYWORDS
     2ADDU 4ADDU 8ADDU 16ADDU ADD ADDU AND ANDNH ANDNL ANDNMH ANDNML BDIF BEV BN
     BNN BNP BNZ BOD BP BSPEC BYTE BZ CMP CMPU CSEV CSN CSNN CSNP CSNZ CSOD CSP CSWAP
diff --git a/lib/lexers/octave.tes b/lib/lexers/octave.tes
index 5f2c5b3..2df769a 100644
--- a/lib/lexers/octave.tes
+++ b/lib/lexers/octave.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.octave]{
-  ESSETLEXERLANGUAGEoctave
+  ESSETILEXERoctave
   0ESSETKEYWORDS
     __FILE__ __LINE__ break case catch classdef continue do else elseif end
     end_try_catch end_unwind_protect endclassdef endenumeration endevents endfor endif
diff --git a/lib/lexers/oscript.tes b/lib/lexers/oscript.tes
index 652e3e0..949e564 100644
--- a/lib/lexers/oscript.tes
+++ b/lib/lexers/oscript.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.oscript]{
-  ESSETLEXERLANGUAGEoscript
+  ESSETILEXERoscript
   0ESSETKEYWORDS
     break breakif by case continue continueif default downto else elseif end for
     goto if in repeat switch to until while function return void dll inbyref inout
diff --git a/lib/lexers/pascal.tes b/lib/lexers/pascal.tes
index e78f383..66e705c 100644
--- a/lib/lexers/pascal.tes
+++ b/lib/lexers/pascal.tes
@@ -9,7 +9,7 @@
 }
 
 @[lexer.set.pascal]{
-  ESSETLEXERLANGUAGEpascal
+  ESSETILEXERpascal
   0ESSETKEYWORDS
     absolute abstract and array as asm assembler automated begin case cdecl
     class const constructor delayed deprecated destructor dispid dispinterface div do
diff --git a/lib/lexers/perl.tes b/lib/lexers/perl.tes
index 7c966b4..3dd99ae 100644
--- a/lib/lexers/perl.tes
+++ b/lib/lexers/perl.tes
@@ -8,7 +8,7 @@
 }
 
 @[lexer.set.perl]{
-  ESSETLEXERLANGUAGEperl
+  ESSETILEXERperl
   0ESSETKEYWORDS
     NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE
     DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode
diff --git a/lib/lexers/php.tes b/lib/lexers/php.tes
index fe6acc3..e60c769 100644
--- a/lib/lexers/php.tes
+++ b/lib/lexers/php.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.php]{
-  ESSETLEXERLANGUAGEhypertext
+  ESSETILEXERhypertext
   0ESSETKEYWORDS
     a abbr acronym address applet area b base basefont bdo big blockquote body
     br button caption center cite code col colgroup dd del dfn dir div dl dt em
diff --git a/lib/lexers/pike.tes b/lib/lexers/pike.tes
index 4540fb1..9686fe2 100644
--- a/lib/lexers/pike.tes
+++ b/lib/lexers/pike.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.pike]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     constant enum if do for while else foreach case switch break continue return
     typeof catch class lambda import inherit static void int string float mixed object
diff --git a/lib/lexers/pov.tes b/lib/lexers/pov.tes
index 133e70e..257ce19 100644
--- a/lib/lexers/pov.tes
+++ b/lib/lexers/pov.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.pov]{
-  ESSETLEXERLANGUAGEpov
+  ESSETILEXERpov
   0ESSETKEYWORDS
     declare local include undef fopen fclose read write default version case
     range break debug error warning if ifdef ifndef switch while macro else end
diff --git a/lib/lexers/powerpro.tes b/lib/lexers/powerpro.tes
index bb0ac11..e487604 100644
--- a/lib/lexers/powerpro.tes
+++ b/lib/lexers/powerpro.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.powerpro]{
-  ESSETLEXERLANGUAGEpowerpro
+  ESSETILEXERpowerpro
   0ESSETKEYWORDS
     break do else elseif endfor endif for function global gt if ifelse ifx jump
     local lt quit static
diff --git a/lib/lexers/purebasic.tes b/lib/lexers/purebasic.tes
index d09df51..e9e20a7 100644
--- a/lib/lexers/purebasic.tes
+++ b/lib/lexers/purebasic.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.purebasic]{
-  ESSETLEXERLANGUAGEpurebasic
+  ESSETILEXERpurebasic
   0ESSETKEYWORDS
     and break case continue data datasection declare declarecdll declaredll
     default deftype dim else elseif end enddatasection endenumeration endif endinterface
diff --git a/lib/lexers/r.tes b/lib/lexers/r.tes
index 75f9a2f..9fb393e 100644
--- a/lib/lexers/r.tes
+++ b/lib/lexers/r.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.r]{
-  ESSETLEXERLANGUAGEr
+  ESSETILEXERr
   0ESSETKEYWORDS
     if else repeat while function for in next break TRUE FALSE NULL NA Inf NaN
   1ESSETKEYWORDS
diff --git a/lib/lexers/rc.tes b/lib/lexers/rc.tes
index 940a11b..db2203d 100644
--- a/lib/lexers/rc.tes
+++ b/lib/lexers/rc.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.rc]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN BITMAP BLOCK
     BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS COMBOBOX CONTROL CTEXT CURSOR
diff --git a/lib/lexers/rebol.tes b/lib/lexers/rebol.tes
index c2555e8..cef071c 100644
--- a/lib/lexers/rebol.tes
+++ b/lib/lexers/rebol.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.rebol]{
-  ESSETLEXERLANGUAGErebol
+  ESSETILEXERrebol
   0ESSETKEYWORDS
     about abs absolute add alert alias all alter and any any-block?
     any-function? any-string? any-type? any-word? append arccosine arcsine arctangent array
diff --git a/lib/lexers/rust.tes b/lib/lexers/rust.tes
index 96e457f..4ffd9b5 100644
--- a/lib/lexers/rust.tes
+++ b/lib/lexers/rust.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.rust]{
-  ESSETLEXERLANGUAGErust
+  ESSETILEXERrust
   0ESSETKEYWORDS
     if else repeat while function for in next break TRUE FALSE NULL NA Inf NaN
   1ESSETKEYWORDS
diff --git a/lib/lexers/scheme.tes b/lib/lexers/scheme.tes
index d56f45d..31af808 100644
--- a/lib/lexers/scheme.tes
+++ b/lib/lexers/scheme.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.scheme]{
-  ESSETLEXERLANGUAGElisp
+  ESSETILEXERlisp
   0ESSETKEYWORDS
     + - * / = < > <= >= => abs acos and angle append apply asin assoc assoc assq
     assv atan begin boolean? caar cadr call-with-current-continuation call/cc
diff --git a/lib/lexers/specman.tes b/lib/lexers/specman.tes
index 6836405..3d83590 100644
--- a/lib/lexers/specman.tes
+++ b/lib/lexers/specman.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.specman]{
-  ESSETLEXERLANGUAGEeiffel
+  ESSETILEXEReiffel
   0ESSETKEYWORDS
     abs acos ascii asin asstring atan atan2 ave case choose choosen choosesets
     clustersize cos cosh count cron dataset dedup denormalize distribute distributed
diff --git a/lib/lexers/spice.tes b/lib/lexers/spice.tes
index 4e15a95..5178d01 100644
--- a/lib/lexers/spice.tes
+++ b/lib/lexers/spice.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.spice]{
-  ESSETLEXERLANGUAGEspice
+  ESSETILEXERspice
   0ESSETKEYWORDS
     ac alias alter alterparam append askvalues assertvalid autoscale break
     compose copy copytodoc dc delete destroy destroyvec diff display disto dowhile echo
diff --git a/lib/lexers/swift.tes b/lib/lexers/swift.tes
index 285b7af..4a20509 100644
--- a/lib/lexers/swift.tes
+++ b/lib/lexers/swift.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.swift]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     class deinit enum extension func import init internal let operator private
     protocol public static struct subscript typealias var break case continue default do
diff --git a/lib/lexers/systemverilog.tes b/lib/lexers/systemverilog.tes
index 76e7aad..3df1225 100644
--- a/lib/lexers/systemverilog.tes
+++ b/lib/lexers/systemverilog.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.systemverilog]{
-  ESSETLEXERLANGUAGEverilog
+  ESSETILEXERverilog
   0ESSETKEYWORDS
     alias always always_comb always_ff always_latch and assert assign assume
     automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case casex
diff --git a/lib/lexers/tacl.tes b/lib/lexers/tacl.tes
index bf24554..a0d5bc9 100644
--- a/lib/lexers/tacl.tes
+++ b/lib/lexers/tacl.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.tacl]{
-  ESSETLEXERLANGUAGETACL
+  ESSETILEXERTACL
   0ESSETKEYWORDS
     activate add adddsttransition adduser alter altpri assign attachseg
     backupcpu break builtins buscmd clear columnize comment compute copy dump copyvar
diff --git a/lib/lexers/tal.tes b/lib/lexers/tal.tes
index 2504183..247c451 100644
--- a/lib/lexers/tal.tes
+++ b/lib/lexers/tal.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.tal]{
-  ESSETLEXERLANGUAGETAL
+  ESSETILEXERTAL
   0ESSETKEYWORDS
     and assert baddr begin by call callable case cbaddr code cwaddr define do
     downto drop else end entry external fixed for forward goto if int interrupt label
diff --git a/lib/lexers/tcl.tes b/lib/lexers/tcl.tes
index 13e1bb1..d5fd022 100644
--- a/lib/lexers/tcl.tes
+++ b/lib/lexers/tcl.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.tcl]{
-  ESSETLEXERLANGUAGEtcl
+  ESSETILEXERtcl
   0ESSETKEYWORDS
     after append array auto_execok auto_import auto_load auto_load_index
     auto_qualify beep bgerror binary break case catch cd clock close concat continue dde
diff --git a/lib/lexers/test.tes b/lib/lexers/test.tes
index 9670b4c..cc719db 100644
--- a/lib/lexers/test.tes
+++ b/lib/lexers/test.tes
@@ -7,7 +7,7 @@
 }
 
 @[lexer.set.test]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   :M[color.comment],1M[color.set]
   :M[color.comment],2M[color.set]
   :M[color.comment],3M[color.set]
diff --git a/lib/lexers/vala.tes b/lib/lexers/vala.tes
index 3e2c457..85b9ceb 100644
--- a/lib/lexers/vala.tes
+++ b/lib/lexers/vala.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.vala]{
-  ESSETLEXERLANGUAGEcpp
+  ESSETILEXERcpp
   0ESSETKEYWORDS
     if else switch case default break continue return yield for foreach in do
     while try catch finally throw
diff --git a/lib/lexers/vb.tes b/lib/lexers/vb.tes
index bf8eae4..c37752b 100644
--- a/lib/lexers/vb.tes
+++ b/lib/lexers/vb.tes
@@ -12,7 +12,7 @@
 }
 
 @[lexer.set.vb]{
-  ESSETLEXERLANGUAGEvb
+  ESSETILEXERvb
   0ESSETKEYWORDS
     addressof alias and as attribute base begin binary boolean byref byte byval
     call case cdbl cint clng compare const csng cstr currency date decimal declare
diff --git a/lib/lexers/verilog.tes b/lib/lexers/verilog.tes
index 33e47a9..23f874f 100644
--- a/lib/lexers/verilog.tes
+++ b/lib/lexers/verilog.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.verilog]{
-  ESSETLEXERLANGUAGEverilog
+  ESSETILEXERverilog
   0ESSETKEYWORDS
     always and assign automatic begin buf bufif0 bufif1 case casex casez cell
     cmos config deassign default defparam design disable edge else end endcase
diff --git a/lib/lexers/vhdl.tes b/lib/lexers/vhdl.tes
index a762b24..37fe9bf 100644
--- a/lib/lexers/vhdl.tes
+++ b/lib/lexers/vhdl.tes
@@ -6,7 +6,7 @@
 }
 
 @[lexer.set.vhdl]{
-  ESSETLEXERLANGUAGEvhdl
+  ESSETILEXERvhdl
   0ESSETKEYWORDS
     access after alias all architecture array assert attribute begin block body
     buffer bus case component configuration constant disconnect downto else elsif end
diff --git a/lib/lexers/vxml.tes b/lib/lexers/vxml.tes
index 86980e7..60dc060 100644
--- a/lib/lexers/vxml.tes
+++ b/lib/lexers/vxml.tes
@@ -5,7 +5,7 @@
 }
 
 @[lexer.set.vxml]{
-  ESSETLEXERLANGUAGEhypertext
+  ESSETILEXERhypertext
   0ESSETKEYWORDS
     assign audio block break catch choice clear disconnect else elseif emphasis
     enumerate error exit field filled form goto grammar help if initial link log menu meta
diff --git a/lib/lexers/xml.tes b/lib/lexers/xml.tes
index 3b6ae41..87ed9b7 100644
--- a/lib/lexers/xml.tes
+++ b/lib/lexers/xml.tes
@@ -14,7 +14,7 @@
 }
 
 @[lexer.set.xml]{
-  ESSETLEXERLANGUAGExml
+  ESSETILEXERxml
   0ESSETKEYWORDS 
   ! DTD keywords !
   5ESSETKEYWORDS
diff --git a/lib/scite2co.lua b/lib/scite2co.lua
index e03a59f..8e47ff2 100755
--- a/lib/scite2co.lua
+++ b/lib/scite2co.lua
@@ -112,11 +112,11 @@ io.write([=[}
 -- NOTE: The lexer encoded in the property file is not
 -- a SCLEX_* name but rather the lexer's module name
 -- as set by the LexerModule constructor.
--- Therefore we must emit SCI_SETLEXERLANGUAGE calls here.
+-- Therefore we must emit SCI_SETILEXER calls here.
 local lexer = expand(get_property_by_pattern("lexer.", file_patterns))
 io.write([=[
 @[lexer.set.]=]..language:lower()..[=[]{
-  ESSETLEXERLANGUAGE]=]..lexer..[=[
+  ESSETILEXER]=]..lexer..[=[
 ]=])
 -- print keyword definitions with word wrapping
 for i = 1, 9 do