Merge 'dev' ~ v581.2 + fix errors/lints + dev tooling fixes/improvements

.github/workflows/CICD.yml

@@ -18,6 +18,13 @@ env:
 
 on: [push, pull_request]
 
+# terminate execution of the current workflow group when there is a newer changeset detected
+# * the group is defined by "WORKFLOW_NAME-REF", where REF can be a branch, tag, or pull-request reference
+# * workflows executing for the default branch are excluded from termination
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }}
+
 jobs:
   build:
     name: Build
@@ -55,7 +62,7 @@ jobs:
         run: |
           ## VARs setup
           log() { for var in "$@" ; do echo ${var}="${!var}"; done; }
-          outputs() { for var in "$@" ; do echo steps.vars.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
+          outputs() { step_id="${{ github.action }}"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
           # staging directory
           STAGING='_staging'
           outputs STAGING

.gitignore

@@ -1,4 +1,5 @@
-# v2022-08-26+less-mods [rivy]
+# v2022-08-27 [rivy]
+# + local-start/end mods for `less`
 
 # NOTE: Git GLOBSTAR syntax [see `git help gitignore`]
 # * ref: [.gitignore] http://git-scm.com/docs/gitignore @@ http://archive.is/Rk6rO
@@ -19,13 +20,14 @@ node_modules
 package-lock.json
 yarn.lock
 
-# ignore localized VSCode logs/settings
+# ignore local-only VSCode artifacts
+# * logs/settings
 .vscode/c_cpp_properties.json
 .vscode/makefile.extension.output
-# * ignore VSCode precompiled headers for IntelliSense
+# * precompiled headers for IntelliSense
 .vscode/ipch/
 
-## local additions ##
+#!local-start
 
 # `less` ~ most older Makefiles still generate artifacts *within* the source code folder
 
@@ -44,3 +46,5 @@ defines.h
 # * object files
 *.o
 *.obj
+
+#!local-end

.vscode/launch.json

@@ -8,7 +8,7 @@
 			"type": "cppdbg",
 			"request": "launch",
 			"program": "${fileWorkspaceFolder}/${config:project.build_dir}/debug-x32/executable.exe",
-			"args": [], // * note: use this configuration array to add run-time arguments to the debugged process
+			"args": ["main.c"], // * note: use this configuration array to add run-time arguments to the debugged process
 			// "args": ["/?"], // * note: use this configuration array to add run-time arguments to the debugged process
 			// "args": ["${fileWorkspaceFolder}/../causes-fault-single-line.txt"],
 			"stopAtEntry": false,

INSTALL.upstream

@@ -1,6 +1,6 @@
-   This file describes how to build and install less using
-the "configure" script.  This only works on Unix systems.
-To install on other systems, read the README file.
+This file contains generic instructions on how to build and
+install software using autoconf. For specific instructions
+on how to build "less", see the README or README.VER file.
 
 
 Basic Installation
@@ -24,8 +24,8 @@ diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
 it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:

Makefile.aut

@@ -1,13 +1,21 @@
 # Makefile for authoring less.
 
 EMAIL = bug-less@gnu.org
-HOMEPAGE = http://www.greenwoodsoftware.com/less
+HOMEPAGE = https://greenwoodsoftware.com/less
 SHELL = /bin/sh
 GIT = git
 NROFF = nroff -t -man
 
 srcdir = .
 
+ifeq ($(USE_PYTHON),1)
+	MKHELP = mkhelp.py
+	MKFUNCS = mkfuncs.py
+else
+	MKHELP = mkhelp.pl
+	MKFUNCS = mkfuncs.pl
+endif
+
 SRC = \
 	main.c screen.c brac.c ch.c charset.c cmdbuf.c \
 	command.c cvt.c decode.c edit.c filename.c forwback.c \
@@ -19,7 +27,7 @@ DISTFILES_W = \
 	defines.ds  Makefile.dsb Makefile.dsg Makefile.dsu \
 	defines.o2  Makefile.o2e \
 	defines.o9  Makefile.o9c Makefile.o9u \
-	defines.wn  Makefile.wnm Makefile.wnb \
+	defines.wn  Makefile.wnm Makefile.wnb Makefile.wng \
 	configure
 UNICODE_FILES = \
 	compose.uni fmt.uni ubin.uni wide.uni
@@ -33,6 +41,7 @@ DISTFILES = \
 	less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \
 	less.hlp \
 	mkfuncs.pl mkhelp.pl \
+	mkfuncs.py mkhelp.py \
 	mkutable $(UNICODE_FILES) \
 	${DISTFILES_W}
 
@@ -49,15 +58,15 @@ release: .FORCE
 help.c: less.hlp
 	-mv -f ${srcdir}/help.c ${srcdir}/help.c.old
 	rm -rf help.c
-	${srcdir}/mkhelp.pl < less.hlp > help.c
+	${srcdir}/${MKHELP} < less.hlp > help.c
 	if cmp -s help.c help.c.old; then mv -f help.c.old help.c; fi
 
 ${srcdir}/configure ${srcdir}/defines.h.in: ${srcdir}/configure.ac ${srcdir}/Makefile.in
 	cd ${srcdir}; autoheader; autoconf
 
 funcs.h: ${SRC:%=${srcdir}/%}
 	-mv -f ${srcdir}/funcs.h ${srcdir}/funcs.h.old
-	perl ${srcdir}/mkfuncs.pl ${SRC:%=${srcdir}/%} >${srcdir}/funcs.h
+	${srcdir}/${MKFUNCS} ${SRC:%=${srcdir}/%} >${srcdir}/funcs.h
 	if cmp -s funcs.h funcs.h.old; then mv -f funcs.h.old funcs.h; fi
 
 lint:
@@ -80,7 +89,6 @@ REPLACE_VERSION = \
 	sed \
 		-e "s;@@VERSION@@;$$REL;" \
 		-e "s;@@DATE@@;$$DT;" \
-		-e "s;@@EMAIL@@;${EMAIL};" \
 		-e "s;@@HOMEPAGE@@;${HOMEPAGE};" >$@
 
 ${srcdir}/README: ${srcdir}/README.VER ${srcdir}/version.c

Makefile.dsb

@@ -48,9 +48,3 @@ clean:
 	-del *.obj
 	-del less.exe
 	-del lesskey.exe
-
-build: all
-compile: $(OBJ)
-rebuild: clean build
-realclean: clean
-veryclean: realclean

Makefile.dsg

@@ -85,8 +85,3 @@ distclean: clean
 
 realclean: distclean
 	command.com /c if exist TAGS del TAGS
-
-build: all
-compile: ${OBJ}
-rebuild: clean build
-veryclean: realclean

Makefile.dsu

@@ -56,9 +56,3 @@ clean:
 	-del *.obj
 	-del less.exe
 	-del lesskey.exe
-
-build: all
-compile: $(OBJ)
-rebuild: clean build
-realclean: clean
-veryclean: realclean

Makefile.in

@@ -121,8 +121,3 @@ distclean: clean
 
 realclean: distclean
 	rm -f TAGS
-
-build: all
-compile: ${OBJ}
-rebuild: clean build
-veryclean: realclean