luatex: sync with the upstream

git-svn-id: svn://tug.org/texlive/trunk@64585 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 17 insertions, 1 deletions

diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 06fa269e47d..f8d6cc0d4e1 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,6 @@
+2022-09-29  Luigi Scarso <luigi.scarso@gmail.com> 
+     * Fixed an infinite loop with --halt-on-error option (K.Berry)
+     
 2022-08-16  Luigi Scarso <luigi.scarso@gmail.com> 
      * Accent 0xFFFD but still error on invalid utf (compatible) (H.Hagen)
      * omitinfodict added: \pdfvariable omitinfodict 1 omit Info dicttionary (H.Hagen)
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.c b/Build/source/texk/web2c/luatexdir/lua/luainit.c
index 5a86b5e0643..35683fccca3 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.c
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.c
@@ -962,6 +962,7 @@ void lua_initialize(int ac, char **av)
     interactionoption = 4;
     filelineerrorstylep = false;
     haltonerrorp = false;
+    haltingonerrorp = false;
     tracefilenames = 1;
     dump_name = NULL;
     /*tex
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 6809e8b9c9d..9821051cb22 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1,4 +1,4 @@
 #ifndef luatex_svn_revision_h
 #define luatex_svn_revision_h
-#define luatex_svn_revision 7539
+#define luatex_svn_revision 7540
 #endif
diff --git a/Build/source/texk/web2c/luatexdir/tex/errors.c b/Build/source/texk/web2c/luatexdir/tex/errors.c
index ce80df99e7e..01b6f44aada 100644
--- a/Build/source/texk/web2c/luatexdir/tex/errors.c
+++ b/Build/source/texk/web2c/luatexdir/tex/errors.c
@@ -436,6 +436,13 @@ void error(void)
         show_context();
     }
     if (haltonerrorp) {
+        /*tex If |close_files_and_terminate| generates an error, we'll end up back
+          here; just give up in that case. If files are truncated, too bad. */
+        if (haltingonerrorp) {
+          /*tex  quit immediately */
+          do_final_end ();
+        }
+        haltingonerrorp=true;
         history = fatal_error_stop;
         jump_out();
     }
diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.c b/Build/source/texk/web2c/luatexdir/tex/mainbody.c
index 3d239b5a24d..fd77be07137 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mainbody.c
+++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.c
@@ -294,6 +294,10 @@ int filelineerrorstylep;
 
 int haltonerrorp;
 
+/*tex already trying to halt? */
+
+boolean haltingonerrorp; 
+
 /*tex current filename is quoted */
 
 boolean quoted_filename;
diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.h b/Build/source/texk/web2c/luatexdir/tex/mainbody.h
index 6bb4e66fe41..011b1958c5e 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mainbody.h
+++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.h
@@ -144,6 +144,7 @@ extern int expand_depth;
 /*extern int parsefirstlinep;*/
 extern int filelineerrorstylep;
 extern int haltonerrorp;
+extern boolean haltingonerrorp;
 extern boolean quoted_filename;
 
 extern int total_pages;