scite 5.3.1 rc1

6 files changed, 182 insertions, 122 deletions

diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
index 7fc7b12..039ea5f 100644
--- a/scite-fedora/scite.spec
+++ b/scite-fedora/scite.spec
@@ -1,6 +1,6 @@
 # Tunables
 # el7 is on 3.x, el8/fc is on 5.x
-%global pkgversion 5.3.0
+%global pkgversion 5.3.1
 # Use lua
 %define with_lua 1
 # Use bundled lua. If 0, then use distro lua
@@ -149,6 +149,9 @@ install -D -p -m 666 %{SOURCE2} %{buildroot}%{_datadir}/scite/SciTEGlobal.proper
 %{_libdir}/*
 
 %changelog
+* Sun Oct 16 2022 B. Stack <bgstack15@gmail.com> - 5.3.1-1/3.7.6-1
+- Update version
+
 * Tue Sep 06 2022 B. Stack <bgstack15@gmail.com> - 5.3.0-1/3.7.6-1
 - Update version
 
diff --git a/scite/debian/_service b/scite/debian/_service
index 0dbb42f..beba213 100644
--- a/scite/debian/_service
+++ b/scite/debian/_service
@@ -14,8 +14,8 @@
    <service name="download_url">
       <param name="protocol">https</param>
       <param name="host">www.scintilla.org</param>
-      <param name="path">scite530.tgz</param>
-      <param name="filename">scite_5.3.0.orig.tar.gz</param>
+      <param name="path">scite531.tgz</param>
+      <param name="filename">scite_5.3.1.orig.tar.gz</param>
    </service>
    <service name="extract_file">
       <param name="archive">*.tar.xz</param>
diff --git a/scite/debian/changelog b/scite/debian/changelog
index 305d96d..2927b3d 100644
--- a/scite/debian/changelog
+++ b/scite/debian/changelog
@@ -1,9 +1,15 @@
-scite (5.3.0-1+devuan) unstable; urgency=medium
+scite (5.3.1-1+devuan) unstable; urgency=medium
 
   * Add stackrpms lua script and customized global.properties
   * Use lua 5.4.4
 
- -- B. Stack <bgstack15@gmail.com>  Tue, 06 Sep 2022 20:33:15 -0400
+ -- B. Stack <bgstack15@gmail.com>  Sun, 16 Oct 2022 16:40:05 -0400
+
+scite (5.3.1-1) unstable; urgency=medium
+
+  * New upstream version 5.3.1
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Wed, 12 Oct 2022 15:27:24 +0200
 
 scite (5.3.0-1) unstable; urgency=medium
 
diff --git a/scite/debian/copyright b/scite/debian/copyright
index 5bd547c..4ed37b6 100644
--- a/scite/debian/copyright
+++ b/scite/debian/copyright
@@ -3,18 +3,18 @@ Upstream-Name: SciTE
 Source: http://scintilla.sourceforge.net/SciTEDownload.html
 
 Files: *
-Copyright: 1998-2014 Neil Hodgson <neilh@scintilla.org>
+Copyright: 1998-2014, Neil Hodgson <neilh@scintilla.org>
 License: scintilla
 
 Files: debian/*
-Copyright: 2000-2002 Aubin Paul <aubin@debian.org>
-           2002-2013 Michael Vogt <mvo@debian.org>
-           2013-2022 Antonio Valentino <antonio.valentino@tiscali.it>
-           2018-2022 Andreas Rönnquist <gusnan@debian.org>
+Copyright: 2000-2002, Aubin Paul <aubin@debian.org>
+           2002-2013, Michael Vogt <mvo@debian.org>
+           2013-2022, Antonio Valentino <antonio.valentino@tiscali.it>
+           2018-2022, Andreas Rönnquist <gusnan@debian.org>
 License: GPL-3.0+
 
 Files: scite/lua/*
-Copyright: 1994-2003 Tecgraf, PUC-Rio
+Copyright: 1994-2003, Tecgraf, PUC-Rio
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -35,79 +35,79 @@ License: Expat
  THE SOFTWARE.
 
 Files: lexilla/lexers/LexRuby.cxx
-Copyright: 2001- Clemens Wyss <wys@helbling.ch>
+Copyright: 2001-, Clemens Wyss <wys@helbling.ch>
 License: scintilla
 
 Files: lexilla/lexers/LexBaan.cxx
-Copyright: 2001- Vamsi Potluru <vamsi@who.net>,
-           2001- Praveen Ambekar <ambekarpraveen@yahoo.com>
+Copyright: 2001-, Vamsi Potluru <vamsi@who.net>,
+           2001-, Praveen Ambekar <ambekarpraveen@yahoo.com>
 License: scintilla
 
 Files: lexilla/lexers/LexAda.cxx
-Copyright: 2002 Sergey Koshcheyev <sergey.k@seznam.cz>
+Copyright: 2002, Sergey Koshcheyev <sergey.k@seznam.cz>
 License: scintilla
 
 Files: lexilla/lexers/LexCLW.cxx
-Copyright: 2003-2004 Ron Schofield <ron@schofieldcomputer.com>
+Copyright: 2003-2004, Ron Schofield <ron@schofieldcomputer.com>
 License: scintilla
 
 Files: lexilla/lexers/LexNsis.cxx
-Copyright: 2003-2005 Angelo Mandato <angelo [at] spaceblue [dot] com>
+Copyright: 2003-2005, Angelo Mandato <angelo [at] spaceblue [dot] com>
 License: scintilla
 
 Files: lexilla/lexers/LexLout.cxx
-Copyright: 2003 Kein-Hong Man <mkh@pl.jaring.my>
+Copyright: 2003, Kein-Hong Man <mkh@pl.jaring.my>
 License: scintilla
 
 Files: lexilla/lexers/LexMPT.cxx
-Copyright: 2003 Marius Gheorghe <mgheorghe@cabletest.com>
+Copyright: 2003, Marius Gheorghe <mgheorghe@cabletest.com>
 License: scintilla
 
 Files: lexilla/lexers/LexEScript.cxx
-Copyright: 2003 Patrizio Bekerle <patrizio@bekerle.com>
+Copyright: 2003, Patrizio Bekerle <patrizio@bekerle.com>
 License: scintilla
 
 Files: lexilla/lexers/LexYAML.cxx
-Copyright: 2003- Sean O'Dell <sean@celsoft.com>
+Copyright: 2003-, Sean O'Dell <sean@celsoft.com>
 License: scintilla
 
 Files: lexilla/lexers/LexAsn1.cxx
-Copyright: 2004 Herr Pfarrer rpfarrer <at> yahoo <dot> de
+Copyright: 2004, Herr Pfarrer rpfarrer <at> yahoo <dot> de
 License: scintilla
 
 Files: lexilla/lexers/LexKix.cxx
-Copyright: 2004 Manfred Becker <manfred@becker-trdf.de>
+Copyright: 2004, Manfred Becker <manfred@becker-trdf.de>
 License: scintilla
 
 Files: lexilla/lexers/LexRebol.cxx
-Copyright: 2005 Pascal Hurni <pascal_hurni@fastmail.fm>
+Copyright: 2005, Pascal Hurni <pascal_hurni@fastmail.fm>
 License: scintilla
 
 Files: lexilla/lexers/LexFlagship.cxx
-Copyright: 1998-2003 Neil Hodgson <neilh@scintilla.org>
-           2005 Randy Butler
-           2010 Xavi <jarabal/at/gmail.com> (Harbour)
+Copyright: 1998-2003, Neil Hodgson <neilh@scintilla.org>
+           2005, Randy Butler
+           2010, Xavi <jarabal/at/gmail.com> (Harbour)
 License: scintilla
 
 Files: lexilla/lexers/LexCaml.cxx
-Copyright: 2005-2009 Robert Roessler <robertr@rftp.com>
+Copyright: 2005-2009, Robert Roessler <robertr@rftp.com>
 License: scintilla
 
 Files: scite/src/Utf8_16.*
-Copyright: 2002 Scott Kirkwood
+Copyright: 2002, Scott Kirkwood
 License: scintilla
 
 Files: scite/src/Credits.cxx
-Copyright: 1998 Dean S. Jones
-           1998-2011 Neil Hodgson <neilh@scintilla.org>
+Copyright: 1998, Dean S. Jones
+           1998-2011, Neil Hodgson <neilh@scintilla.org>
 License: scintilla
 
 Files: scite/gtk/pixmapsGNOME.h
-Copyright: 1998 Dean S. Jones
+Copyright: 1998, Dean S. Jones
 License: scintilla
 
 Files: lexilla/lexers/LexTCL.cxx
-Copyright: 1998-2001 Andre Arpin <arpin@kingston.net>
+Copyright: 1998-2001, Andre Arpin <arpin@kingston.net>
 License: scintilla
 
 Files: scintilla/cocoa/PlatCocoa.h
@@ -116,11 +116,11 @@ Files: scintilla/cocoa/PlatCocoa.h
        scintilla/cocoa/ScintillaTest/main.m
        scintilla/cocoa/InfoBar.h
        scintilla/cocoa/ScintillaCocoa.h
-Copyright: 2009 Sun Microsystems, Inc.
+Copyright: 2009, Sun Microsystems, Inc.
 License: LGPL-2.1
 
 Files: scintilla/cocoa/ScintillaView.h
-Copyright: 2009, 2011 Sun Microsystems, Inc.
+Copyright: 2009, 2011, Sun Microsystems, Inc.
            2011, 2013, Oracle and/or its affiliates
 License: LGPL-2.1
 
@@ -136,79 +136,79 @@ Copyright: 1990-2011, Scientific Toolworks, Inc
 License: scintilla
 
 Files: scintilla/qt/ScintillaEdit/ScintillaDocument.*
-Copyright: 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+Copyright: 2011, Archaeopteryx Software, Inc. d/b/a Wingware
 License: scintilla
 
 Files: lexilla/lexers/LexCmake.cxx
-Copyright: 2007 Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+Copyright: 2007, Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
 License: scintilla
 
 Files: lexilla/lexers/LexKVIrc.cxx
-Copyright: 1998-2002 Neil Hodgson <neilh@scintilla.org>
-           2013 OmegaPhil <OmegaPhil+scintilla@gmail.com>
-           2007 Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+Copyright: 1998-2002, Neil Hodgson <neilh@scintilla.org>
+           2013, OmegaPhil <OmegaPhil+scintilla@gmail.com>
+           2007, Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
 License: scintilla
 
 Files: lexilla/lexers/LexAVS.cxx
-Copyright: 2012 Bruno Barbieri <brunorex@gmail.com>
+Copyright: 2012, Bruno Barbieri <brunorex@gmail.com>
 License: scintilla
 
 Files: lexilla/lexers/LexGAP.cxx
-Copyright: 2007 Istvan Szollosi ( szteven <at> gmail <dot> com )
+Copyright: 2007, Istvan Szollosi ( szteven <at> gmail <dot> com )
 License: scintilla
 
 Files: lexilla/lexers/LexSML.cxx
-Copyright: 2009 James Moffatt and Yuzhou Xin
+Copyright: 2009, James Moffatt and Yuzhou Xin
 License: scintilla
 
 Files: lexilla/lexers/LexRust.cxx
-Copyright: 1998-2005 Neil Hodgson <neilh@scintilla.org>
-           2013 SiegeLord <slabode@aim.com>
+Copyright: 1998-2005, Neil Hodgson <neilh@scintilla.org>
+           2013, SiegeLord <slabode@aim.com>
 License: scintilla
 
 Files: lexilla/lexers/LexSpice.cxx
-Copyright: 2006 Fabien Proriol
+Copyright: 2006, Fabien Proriol
 License: scintilla
 
 Files: lexilla/lexers/LexA68k.cxx
-Copyright: 2010 Martial Demolins <mdemolins(a)gmail.com>
+Copyright: 2010, Martial Demolins <mdemolins(a)gmail.com>
 License: scintilla
 
 Files: lexilla/lexers/LexPO.cxx
-Copyright: 2012 Colomban Wendling <ban@herbesfolles.org>
+Copyright: 2012, Colomban Wendling <ban@herbesfolles.org>
 License: scintilla
 
 Files: lexilla/lexers/LexD.cxx
-Copyright: 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-           2006 Waldemar Augustyn <waldemar@wdmsys.com>
+Copyright: 1998-2005, by Neil Hodgson <neilh@scintilla.org>
+           2006, Waldemar Augustyn <waldemar@wdmsys.com>
 License: scintilla
 
 Files: lexilla/lexers/LexPowerShell.cxx
-Copyright: 2008 Tim Gerundt <tim@gerundt.de>
+Copyright: 2008, Tim Gerundt <tim@gerundt.de>
 License: scintilla
 
 Files: lexilla/lexers/LexDMIS.cxx
-Copyright: 1998-2005 Neil Hodgson <neilh@scintilla.org>
-           2013-2014 Andreas Tscharner <andy@vis.ethz.ch>
+Copyright: 1998-2005, Neil Hodgson <neilh@scintilla.org>
+           2013-2014, Andreas Tscharner <andy@vis.ethz.ch>
 License: scintilla
 
 Files: lexilla/lexers/LexNimrod.cxx
-Copyright: 1998-2002 Neil Hodgson <neilh@scintilla.org>
-           2009 Andreas Rumpf
+Copyright: 1998-2002, Neil Hodgson <neilh@scintilla.org>
+           2009, Andreas Rumpf
 License: scintilla
 
 Files: lexilla/lexers/LexProgress.cxx
-Copyright: 2006-2007 Yuval Papish <Yuval@YuvCom.com>
+Copyright: 2006-2007, Yuval Papish <Yuval@YuvCom.com>
 License: scintilla
 
 Files: scite/src/JobQueue.cxx
-Copyright: 1998-2003 Neil Hodgson <neilh@scintilla.org>
-           2007 Neil Hodgson <neilh@scintilla.org>,
-                April White <april_white@sympatico.ca>
+Copyright: 1998-2003, Neil Hodgson <neilh@scintilla.org>
+           2007, Neil Hodgson <neilh@scintilla.org>,
+                 April White <april_white@sympatico.ca>
 License: scintilla
 
 Files: scintilla/test/unit/catch.hpp
-Copyright: 2012 Two Blue Cubes Ltd.
+Copyright: 2012, Two Blue Cubes Ltd.
 License: BSL-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
diff --git a/scite/debian/scite+devuan.dsc b/scite/debian/scite+devuan.dsc
index a60b28c..9560434 100644
--- a/scite/debian/scite+devuan.dsc
+++ b/scite/debian/scite+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: scite
 Binary: scite
 Architecture: any
-Version: 5.3.0-1+devuan
+Version: 5.3.1-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://scintilla.org/SciTE.html
 Standards-Version: 4.6.0.1
diff --git a/scite/stackrpms-5.2.3-1.diff b/scite/stackrpms-5.3.1-1.diff
index 6176c71..dd5bf67 100644
--- a/scite/stackrpms-5.2.3-1.diff
+++ b/scite/stackrpms-5.3.1-1.diff
@@ -1,20 +1,20 @@
 diff -x '.*.swp' -Naur scite.salsa/debian/changelog stackrpms/scite/debian/changelog
---- scite.salsa/debian/changelog	2022-05-31 09:48:57.251826229 -0400
-+++ stackrpms/scite/debian/changelog	2022-05-31 10:31:22.917242269 -0400
+--- scite.salsa/debian/changelog	2022-10-16 16:35:01.550680576 -0400
++++ stackrpms/scite/debian/changelog	2022-10-16 16:40:14.802212981 -0400
 @@ -1,3 +1,10 @@
-+scite (5.2.3-1+devuan) obs; urgency=medium
++scite (5.3.1-1+devuan) unstable; urgency=medium
 +
 +  * Add stackrpms lua script and customized global.properties
 +  * Use lua 5.4.4
 +
-+ -- B. Stack <bgstack15@gmail.com>  Tue, 31 May 2022 10:31:51 -0400
++ -- B. Stack <bgstack15@gmail.com>  Sun, 16 Oct 2022 16:40:05 -0400
 +
- scite (5.2.3-1) unstable; urgency=medium
+ scite (5.3.1-1) unstable; urgency=medium
  
-   * New upstream version 5.2.3
+   * New upstream version 5.3.1
 diff -x '.*.swp' -Naur scite.salsa/debian/control stackrpms/scite/debian/control
---- scite.salsa/debian/control	2022-04-05 09:49:25.955774896 -0400
-+++ stackrpms/scite/debian/control	2022-04-16 12:53:10.788708356 -0400
+--- scite.salsa/debian/control	2022-07-11 14:49:34.810997853 -0400
++++ stackrpms/scite/debian/control	2022-07-13 09:49:28.021934314 -0400
 @@ -1,14 +1,13 @@
  Source: scite
 -Maintainer: Michael Vogt <mvo@debian.org>
@@ -30,12 +30,12 @@ diff -x '.*.swp' -Naur scite.salsa/debian/control stackrpms/scite/debian/control
                 libglib2.0-dev,
 -               liblua5.3-dev
 +               liblua5.4-dev
- Standards-Version: 4.6.0.1
+ Standards-Version: 4.6.1
  Vcs-Browser: https://salsa.debian.org/debian/scite
  Vcs-Git: https://salsa.debian.org/debian/scite.git
 diff -x '.*.swp' -Naur scite.salsa/debian/patches/0007-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
 --- scite.salsa/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-04-05 09:49:25.955774896 -0400
-+++ stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-04-16 12:53:10.996710687 -0400
++++ stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-05-31 14:42:26.029549590 -0400
 @@ -33,8 +33,8 @@
  -CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
  -CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
@@ -49,7 +49,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/0007-Build-with-Debian-package
   ifdef gnomeprefix
 diff -x '.*.swp' -Naur scite.salsa/debian/patches/series stackrpms/scite/debian/patches/series
 --- scite.salsa/debian/patches/series	2022-04-05 09:49:25.955774896 -0400
-+++ stackrpms/scite/debian/patches/series	2022-04-16 12:53:11.032711091 -0400
++++ stackrpms/scite/debian/patches/series	2022-04-18 14:47:52.918861806 -0400
 @@ -2,3 +2,4 @@
  0003-reproducible_build.patch
  0005-scite-desktop.patch
@@ -57,13 +57,16 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/series stackrpms/scite/debian/
 +use-lua5.4.4.patch
 diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/scite/debian/patches/use-lua5.4.4.patch
 --- scite.salsa/debian/patches/use-lua5.4.4.patch	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/patches/use-lua5.4.4.patch	2022-04-16 12:53:11.044711225 -0400
-@@ -0,0 +1,187 @@
++++ stackrpms/scite/debian/patches/use-lua5.4.4.patch	2022-06-26 16:30:14.437640315 -0400
+@@ -0,0 +1,191 @@
 +Name: Patch scite to use distro package of lua, Devuan
-+Version: 5.2.2
-+Lua Version: 5.4.4
++Version: 5.2.3
++Lua-Version: 5.4.4
 +Author: bgstack15@gmail.com
-+Date: 2022-04-04
++Date-Modified: 2022-05-31
++Message: Generated with the following command
++
++    sed -r -e 's/checkint\(/checkinteger\(/g;' -e 's/lua_strlen\(/lua_rawlen\(/g;' scite/src/LuaExtension.cxx > ~/LuaExtension.cxx.new
 +diff -aur scite/gtk/deps.mak scite/gtk/deps.mak
 +--- a/scite/gtk/deps.mak	2022-03-30 20:48:24.000000000 -0400
 ++++ b/scite/gtk/deps.mak	2022-04-04 14:47:39.110529717 -0400
@@ -84,61 +87,61 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 +diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
 +--- a/scite/src/LuaExtension.cxx	2022-03-30 20:48:24.000000000 -0400
 ++++ b/scite/src/LuaExtension.cxx	2022-04-04 14:46:35.097978533 -0400
-+@@ -237,7 +237,7 @@
++@@ -238,7 +238,7 @@
 + 
-+ 	const int paneIndex = lua_upvalueindex(1);
++ 	constexpr int paneIndex = lua_upvalueindex(1);
 + 	check_pane_object(L, paneIndex);
 +-	const int message = luaL_checkint(L, 1);
 ++	const int message = luaL_checkinteger(L, 1);
 + 
 + 	lua_pushvalue(L, paneIndex);
 + 	lua_replace(L, 1);
-+@@ -276,7 +276,7 @@
++@@ -277,7 +277,7 @@
 + }
 + 
-+ static int cf_scite_constname(lua_State *L) {
++ int cf_scite_constname(lua_State *L) {
 +-	const int message = luaL_checkint(L, 1);
 ++	const int message = luaL_checkinteger(L, 1);
 + 	const char *prefix = luaL_optstring(L, 2, nullptr);
 + 	const std::string constName = IFaceTable::GetConstantName(message, prefix);
 + 	if (constName.length() > 0) {
-+@@ -307,7 +307,7 @@
++@@ -308,7 +308,7 @@
 + }
 + 
-+ static int cf_scite_menu_command(lua_State *L) {
++ int cf_scite_menu_command(lua_State *L) {
 +-	const int cmdID = luaL_checkint(L, 1);
 ++	const int cmdID = luaL_checkinteger(L, 1);
 + 	if (cmdID) {
 + 		host->DoMenuCommand(cmdID);
 + 	}
-+@@ -329,7 +329,7 @@
++@@ -330,7 +330,7 @@
 + }
 + 
-+ static int cf_scite_strip_set(lua_State *L) {
++ int cf_scite_strip_set(lua_State *L) {
 +-	const int control = luaL_checkint(L, 1);
 ++	const int control = luaL_checkinteger(L, 1);
 + 	const char *value = luaL_checkstring(L, 2);
 + 	if (value) {
 + 		host->UserStripSet(control, value);
-+@@ -338,7 +338,7 @@
++@@ -339,7 +339,7 @@
 + }
 + 
-+ static int cf_scite_strip_set_list(lua_State *L) {
++ int cf_scite_strip_set_list(lua_State *L) {
 +-	const int control = luaL_checkint(L, 1);
 ++	const int control = luaL_checkinteger(L, 1);
 + 	const char *value = luaL_checkstring(L, 2);
 + 	if (value) {
 + 		host->UserStripSetList(control, value);
-+@@ -347,7 +347,7 @@
++@@ -348,7 +348,7 @@
 + }
 + 
-+ static int cf_scite_strip_value(lua_State *L) {
++ int cf_scite_strip_value(lua_State *L) {
 +-	const int control = luaL_checkint(L, 1);
 ++	const int control = luaL_checkinteger(L, 1);
 + 	std::string value = host->UserStripValue(control);
 + 	push_string(L, value);
 + 	return 1;
-+@@ -437,7 +437,7 @@
++@@ -438,7 +438,7 @@
 + 		SA::Position rangeStart = 0;
 + 		SA::Position rangeEnd = 0;
 + 
@@ -147,7 +150,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		hasError = (flags == 0 && lua_gettop(L) > nArgs);
 + 
 + 		if (!hasError) {
-+@@ -514,7 +514,7 @@
++@@ -515,7 +515,7 @@
 + 
 + 	SA::ScintillaCall &sc = host->PaneCaller(pmo->pane);
 + 	sc.SetTarget(pmo->range);
@@ -156,7 +159,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 	pmo->range.end = sc.TargetEnd();
 + 	return 0;
 + }
-+@@ -600,7 +600,7 @@
++@@ -601,7 +601,7 @@
 + 		pmo->endPosOrig = 0;
 + 		pmo->flags = 0;
 + 		if (nargs >= 3) {
@@ -165,7 +168,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 			if (nargs >= 4) {
 + 				pmo->range.end = pmo->endPosOrig = luaL_checkinteger(L, 4);
 + 				if (pmo->range.end < 0) {
-+@@ -765,7 +765,7 @@
++@@ -766,7 +766,7 @@
 + 	const int nargs = lua_gettop(L);
 + 	const char *code = luaL_checkstring(L, 1);
 + 	const char *name = luaL_optstring(L, 2, code);
@@ -174,7 +177,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		lua_call(L, 0, LUA_MULTRET);
 + 		return lua_gettop(L) - nargs;
 + 	} else {
-+@@ -896,7 +896,7 @@
++@@ -897,7 +897,7 @@
 + 	int loopParamCount = 2;
 + 
 + 	if (func.paramType[0] == iface_length && func.paramType[1] == iface_string) {
@@ -183,18 +186,18 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		params[1] = SptrFromString(params[0] ? lua_tostring(L, arg) : "");
 + 		loopParamCount = 0;
 + 	} else if ((func.paramType[1] == iface_stringresult) || (func.returnType == iface_stringresult)) {
-+@@ -915,8 +915,8 @@
++@@ -916,8 +916,8 @@
 + 			const char *s = lua_tostring(L, arg++);
 + 			params[i] = SptrFromString(s ? s : "");
 + 		} else if (func.paramType[i] == iface_keymod) {
 +-			const int keycode = luaL_checkint(L, arg++) & 0xFFFF;
-+-			const int modifiers = luaL_checkint(L, arg++) &
++-			const intptr_t modifiers = luaL_checkint(L, arg++) &
 ++			const int keycode = luaL_checkinteger(L, arg++) & 0xFFFF;
-++			const int modifiers = luaL_checkinteger(L, arg++) &
+++			const intptr_t modifiers = luaL_checkinteger(L, arg++) &
 + 					      static_cast<int>(SA::KeyMod::Shift|SA::KeyMod::Ctrl|SA::KeyMod::Alt);
 + 			params[i] = keycode | (modifiers<<16);
 + 		} else if (func.paramType[i] == iface_bool) {
-+@@ -1805,7 +1805,7 @@
++@@ -1787,7 +1787,7 @@
 + 	static int SetLevelAt(lua_State *L) {
 + 		StylingContext *context = Context(L);
 + 		const SA::Line line = luaL_checkinteger(L, 2);
@@ -203,7 +206,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		context->styler->SetLevel(line, static_cast<SA::FoldLevel>(level));
 + 		return 0;
 + 	}
-+@@ -1820,7 +1820,7 @@
++@@ -1802,7 +1802,7 @@
 + 	static int SetLineState(lua_State *L) {
 + 		StylingContext *context = Context(L);
 + 		const SA::Line line = luaL_checkinteger(L, 2);
@@ -212,7 +215,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		context->styler->SetLineState(line, stateOfLine);
 + 		return 0;
 + 	}
-+@@ -1898,7 +1898,7 @@
++@@ -1880,7 +1880,7 @@
 + 		StylingContext *context = Context(L);
 + 		const SA::Position startPosStyle = luaL_checkinteger(L, 2);
 + 		const SA::Position lengthStyle = luaL_checkinteger(L, 3);
@@ -221,7 +224,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		context->StartStyling(startPosStyle, lengthStyle, initialStyle);
 + 		return 0;
 + 	}
-+@@ -1957,7 +1957,7 @@
++@@ -1939,7 +1939,7 @@
 + 	static int SetState(lua_State *L) {
 + 		StylingContext *context = Context(L);
 + 		context->Colourize();
@@ -230,7 +233,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		return 0;
 + 	}
 + 
-+@@ -1965,13 +1965,13 @@
++@@ -1947,13 +1947,13 @@
 + 		StylingContext *context = Context(L);
 + 		context->Forward();
 + 		context->Colourize();
@@ -246,36 +249,28 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 + 		return 0;
 + 	}
 + 
++
 diff -x '.*.swp' -Naur scite.salsa/debian/rules stackrpms/scite/debian/rules
---- scite.salsa/debian/rules	2022-04-05 09:49:25.955774896 -0400
-+++ stackrpms/scite/debian/rules	2022-04-16 12:53:11.044711225 -0400
-@@ -1,6 +1,7 @@
- #!/usr/bin/make -f
- 
- export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-+#export DEB_BUILD_OPTIONS=noautodbgsym
- 
- include /usr/share/dpkg/pkg-info.mk
- BUILD_DATE ?= $(shell date --utc --date="@$(SOURCE_DATE_EPOCH)" "+%b %d %Y %T")
-@@ -43,6 +44,9 @@
+--- scite.salsa/debian/rules	2022-07-11 14:49:34.810997853 -0400
++++ stackrpms/scite/debian/rules	2022-07-13 09:49:28.021934314 -0400
+@@ -43,6 +43,8 @@
  	mv -f $(CURDIR)/debian/scite/usr/share/scite/*.txt $(CURDIR)/debian/scite/usr/share/doc/scite/
  	mv -f $(CURDIR)/debian/scite/usr/share/scite/*.jpg $(CURDIR)/debian/scite/usr/share/doc/scite/
  	mv -f $(CURDIR)/debian/scite/usr/share/scite/*.png $(CURDIR)/debian/scite/usr/share/doc/scite/
 +	cp -p debian/stackrpms.lua $(CURDIR)/debian/scite/usr/share/scite/
-+	@#install -d -m0755 $(CURDIR)/debian/scite/etc/scite
 +	install -D -p -m0666 debian/SciTEGlobal.properties $(CURDIR)/debian/scite/etc/scite/
  	for f in $(CURDIR)/debian/scite/usr/share/doc/scite/*.html; do \
  		dh_link usr/share/doc/scite/$$(basename $$f) usr/share/scite/$$(basename $$f); \
  	done
 diff -x '.*.swp' -Naur scite.salsa/debian/scite+devuan.dsc stackrpms/scite/debian/scite+devuan.dsc
 --- scite.salsa/debian/scite+devuan.dsc	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/scite+devuan.dsc	2022-05-31 10:34:35.666680650 -0400
++++ stackrpms/scite/debian/scite+devuan.dsc	2022-10-16 16:41:29.431054544 -0400
 @@ -0,0 +1,17 @@
 +Format: 3.0 (quilt)
 +Source: scite
 +Binary: scite
 +Architecture: any
-+Version: 5.2.3-1+devuan
++Version: 5.3.1-1+devuan
 +Maintainer: B. Stack <bgstack15@gmail.com>
 +Homepage: https://scintilla.org/SciTE.html
 +Standards-Version: 4.6.0.1
@@ -290,8 +285,8 @@ diff -x '.*.swp' -Naur scite.salsa/debian/scite+devuan.dsc stackrpms/scite/debia
 +Original-Maintainer: Michael Vogt <mvo@debian.org>
 diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite/debian/SciTEGlobal.properties
 --- scite.salsa/debian/SciTEGlobal.properties	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/SciTEGlobal.properties	2022-04-16 12:53:10.776708221 -0400
-@@ -0,0 +1,580 @@
++++ stackrpms/scite/debian/SciTEGlobal.properties	2022-10-05 11:03:14.200880601 -0400
+@@ -0,0 +1,596 @@
 +# SciTEGlobal.properties placed by scite package for stackrpms
 +# Global initialisation file for SciTE
 +# For Linux, place in $prefix/share/scite
@@ -343,6 +338,20 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +#magnification=-1
 +#output.magnification=-1
 +
++change.history=3
++#~ indicator.reverted.to.origin.insertion=style:squiggle,colour:#40A0BF
++#~ indicator.reverted.to.origin.deletion=style:point,colour:#40A0BF
++#~ indicator.saved.insertion=style:squiggle,colour:#60A060
++#~ indicator.saved.deletion=style:point,colour:#00A000
++#~ indicator.modified.insertion=style:squiggle,colour:#A0A060
++#~ indicator.modified.deletion=style:point,colour:#A0A000
++#~ indicator.reverted.to.modified.insertion=style:squiggle,colour:#FF8000
++#~ indicator.reverted.to.modified.deletion=style:point,colour:#FF8000
++#~ marker.reverted.to.origin=style:leftrect,fore:#40A0BF,back:#40A0BF
++#~ marker.saved=style:leftrect,fore:#00A000,back:#00A000
++#~ marker.modified=style:leftrect,fore:#A0A000,back:#A0A000
++#~ marker.reverted.to.modified=style:leftrect,fore:#FF8000,back:#FF8000
++
 +# Sizes and visibility in edit pane
 +line.margin.visible=1
 +line.margin.width=4
@@ -452,6 +461,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +title.full.path=1
 +#title.show.buffers=1
 +#pathbar.visible=1
++#pathbar.selectable=1
 +save.recent=1
 +save.session=1
 +#session.bookmarks=1
@@ -535,6 +545,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +#find.in.files.close.on.find=0
 +#find.in.dot=1
 +#find.in.binary=1
++#find.exclude=*.bak *.orig debug
 +#find.in.directory=
 +#find.close.on.find=0
 +#find.replace.matchcase=1
@@ -872,16 +883,56 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +font.embedded.base=$(font.monospace)
 +font.embedded.comment=$(font.monospace)
 +font.vbs=$(font.monospace)
+diff -x '.*.swp' -Naur scite.salsa/debian/scite.lintian-overrides stackrpms/scite/debian/scite.lintian-overrides
+--- scite.salsa/debian/scite.lintian-overrides	2022-09-06 20:31:38.343720623 -0400
++++ stackrpms/scite/debian/scite.lintian-overrides	2022-07-13 09:49:28.021934314 -0400
+@@ -1,3 +1,4 @@
++scite: spelling-error-in-binary afe safe [usr/lib/scite/liblexilla.so]
+ scite: spelling-error-in-binary Lables Labels [usr/lib/scite/liblexilla.so]
+ scite: national-encoding [etc/scite/SciTEGlobal.properties]
+ scite: national-encoding [etc/scite/rebol.properties]
+diff -x '.*.swp' -Naur scite.salsa/debian/_service stackrpms/scite/debian/_service
+--- scite.salsa/debian/_service	1969-12-31 19:00:00.000000000 -0500
++++ stackrpms/scite/debian/_service	2022-10-16 16:42:27.103704895 -0400
+@@ -0,0 +1,24 @@
++<services>
++   <service name="tar_scm">
++      <param name="scm">git</param>
++      <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param>
++      <param name="subdir">scite/debian</param>
++      <param name="filename">debian</param>
++      <param name="revision">scite-bump</param>
++      <param name="version">_none_</param>
++   </service>
++   <service name="recompress">
++      <param name="file">*.tar</param>
++      <param name="compression">xz</param>
++   </service>
++   <service name="download_url">
++      <param name="protocol">https</param>
++      <param name="host">www.scintilla.org</param>
++      <param name="path">scite531.tgz</param>
++      <param name="filename">scite_5.3.1.orig.tar.gz</param>
++   </service>
++   <service name="extract_file">
++      <param name="archive">*.tar.xz</param>
++      <param name="files">*/*.dsc</param>
++   </service>
++</services>
 diff -x '.*.swp' -Naur scite.salsa/debian/source/lintian-overrides stackrpms/scite/debian/source/lintian-overrides
---- scite.salsa/debian/source/lintian-overrides	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/source/lintian-overrides	2022-04-16 12:53:11.104711898 -0400
-@@ -0,0 +1,3 @@
+--- scite.salsa/debian/source/lintian-overrides	2022-07-11 14:49:34.810997853 -0400
++++ stackrpms/scite/debian/source/lintian-overrides	2022-04-18 14:47:52.938861975 -0400
+@@ -1,4 +1,3 @@
+-scite source: source-is-missing [scintilla/doc/ScintillaDoc.html]
+-scite source: source-is-missing [scite/doc/PaneAPI.html]
+-scite source: source-is-missing [scite/doc/ScriptLexer.html]
+-scite source: source-is-missing [scintilla/doc/SciCoding.html]
 +national-encoding debian/SciTEGlobal.properties
 +invalid-field-for-derivative
 +invalid-devuan-version
 diff -x '.*.swp' -Naur scite.salsa/debian/stackrpms.lua stackrpms/scite/debian/stackrpms.lua
 --- scite.salsa/debian/stackrpms.lua	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/stackrpms.lua	2022-04-16 12:53:11.104711898 -0400
++++ stackrpms/scite/debian/stackrpms.lua	2022-04-18 14:47:52.938861975 -0400
 @@ -0,0 +1,278 @@
 +-- DESCRIPTION:
 +-- Unicode hexadecimal table: https://example.com/copied/unicode.html