texlive[64585] Build/source/texk/web2c/luatexdir: luatex: sync with

[commits+kakuto at tug.org]

Revision: 64585
          http://tug.org/svn/texlive?view=revision&revision=64585
Author:   kakuto
Date:     2022-10-02 22:20:06 +0200 (Sun, 02 Oct 2022)
Log Message:
-----------
luatex: sync with the upstream

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
    trunk/Build/source/texk/web2c/luatexdir/tex/errors.c
    trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c
    trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2022-10-02 20:19:41 UTC (rev 64584)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2022-10-02 20:20:06 UTC (rev 64585)
@@ -1,3 +1,6 @@
+2022-09-29  Luigi Scarso <luigi.scarso at gmail.com> 
+     * Fixed an infinite loop with --halt-on-error option (K.Berry)
+     
 2022-08-16  Luigi Scarso <luigi.scarso at gmail.com> 
      * Accent 0xFFFD but still error on invalid utf (compatible) (H.Hagen)
      * omitinfodict added: \pdfvariable omitinfodict 1 omit Info dicttionary (H.Hagen)

Modified: trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c	2022-10-02 20:19:41 UTC (rev 64584)
+++ trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c	2022-10-02 20:20:06 UTC (rev 64585)
@@ -962,6 +962,7 @@
     interactionoption = 4;
     filelineerrorstylep = false;
     haltonerrorp = false;
+    haltingonerrorp = false;
     tracefilenames = 1;
     dump_name = NULL;
     /*tex

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2022-10-02 20:19:41 UTC (rev 64584)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2022-10-02 20:20:06 UTC (rev 64585)
@@ -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

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/errors.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/errors.c	2022-10-02 20:19:41 UTC (rev 64584)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/errors.c	2022-10-02 20:20:06 UTC (rev 64585)
@@ -436,6 +436,13 @@
         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();
     }

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c	2022-10-02 20:19:41 UTC (rev 64584)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c	2022-10-02 20:20:06 UTC (rev 64585)
@@ -294,6 +294,10 @@
 
 int haltonerrorp;
 
+/*tex already trying to halt? */
+
+boolean haltingonerrorp; 
+
 /*tex current filename is quoted */
 
 boolean quoted_filename;

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h	2022-10-02 20:19:41 UTC (rev 64584)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h	2022-10-02 20:20:06 UTC (rev 64585)
@@ -144,6 +144,7 @@
 /*extern int parsefirstlinep;*/
 extern int filelineerrorstylep;
 extern int haltonerrorp;
+extern boolean haltingonerrorp;
 extern boolean quoted_filename;
 
 extern int total_pages;