texlive[71418] Build/source/texk/web2c: do not check for \outer

[commits+karl at tug.org]

Revision: 71418
          https://tug.org/svn/texlive?view=revision&revision=71418
Author:   karl
Date:     2024-06-04 00:45:54 +0200 (Tue, 04 Jun 2024)
Log Message:
-----------
do not check for \outer validity unless OK_to_interrupt

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/euptexdir/ChangeLog
    trunk/Build/source/texk/web2c/euptexdir/suppresserrors.ch
    trunk/Build/source/texk/web2c/tex.ch

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2024-06-03 22:32:13 UTC (rev 71417)
+++ trunk/Build/source/texk/web2c/ChangeLog	2024-06-03 22:45:54 UTC (rev 71418)
@@ -1,3 +1,12 @@
+2024-06-03  David Fuchs  <drfuchs at yahoo.com>
+
+	* tex.ch (check_outer_validity): don't check unless OK_to_interrupt,
+	to avoid getting into an erroneous state if an \outer token
+	is deleted interactively.
+	Report from Tyge Thiessen:
+	https://tug.org/pipermail/tex-k/2024-March/004021.html
+	DEK bug entry: https://tug.org/texmfbug/newbug.html#B142outer
+
 2024-06-03  Karl Berry  <karl at freefriends.org>
 
 	* tests/fix-changefile-lines.py: new script from Tyge Thiessen

Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2024-06-03 22:32:13 UTC (rev 71417)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2024-06-03 22:45:54 UTC (rev 71418)
@@ -1,3 +1,9 @@
+2024-06-03  Karl Berry  <karl at freefriends.org>
+
+	* suppresserrors.ch (check_outer_validity): comment out hunk
+	for this procedure adding a check for "suppress_outer_error=0", to
+	avoid conflict with new change in tex.ch at the same place.
+
 2024-05-18  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* euptex-ctrlsym.test, tests/ctrlsym.{tex,log},

Modified: trunk/Build/source/texk/web2c/euptexdir/suppresserrors.ch
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/suppresserrors.ch	2024-06-03 22:32:13 UTC (rev 71417)
+++ trunk/Build/source/texk/web2c/euptexdir/suppresserrors.ch	2024-06-03 22:45:54 UTC (rev 71418)
@@ -26,17 +26,18 @@
 @d suppress_mathpar_error==int_par(suppress_mathpar_error_code)
 @z
 
- at x {Perhaps this change hunk is not needed}
- at p procedure check_outer_validity;
-var p:pointer; {points to inserted token list}
-@!q:pointer; {auxiliary pointer}
-begin if scanner_status<>normal then
- at y
- at p procedure check_outer_validity;
-var p:pointer; {points to inserted token list}
-@!q:pointer; {auxiliary pointer}
-begin if suppress_outer_error=0 then if scanner_status<>normal then
- at z
+% As of June 2024, this hunk conflicts with a new change in tex.ch.
+%@x {Perhaps this change hunk is not needed}
+%@p procedure check_outer_validity;
+%var p:pointer; {points to inserted token list}
+%@!q:pointer; {auxiliary pointer}
+%begin if scanner_status<>normal then
+%@y
+%@p procedure check_outer_validity;
+%var p:pointer; {points to inserted token list}
+%@!q:pointer; {auxiliary pointer}
+%begin if suppress_outer_error=0 then if scanner_status<>normal then
+%@z
 
 @x @<Finish line, emit a \.{\\par}@>
 if cur_cmd>=outer_call then check_outer_validity;

Modified: trunk/Build/source/texk/web2c/tex.ch
===================================================================
--- trunk/Build/source/texk/web2c/tex.ch	2024-06-03 22:32:13 UTC (rev 71417)
+++ trunk/Build/source/texk/web2c/tex.ch	2024-06-03 22:45:54 UTC (rev 71418)
@@ -1501,6 +1501,14 @@
 source_filename_stack[0]:=0;full_source_filename_stack[0]:=0;
 @z
 
+% Original report: https://tug.org/pipermail/tex-k/2024-March/004021.html
+% TeX bug entry:   https://tug.org/texmfbug/newbug.html#B142outer
+ at x [24.336] l.7152 - allow interactive deletion of \outer token
+begin if scanner_status<>normal then
+ at y
+begin if OK_to_interrupt and(scanner_status<>normal) then
+ at z
+
 @x [24.338] l.7191 - i18n fix
 print(" while scanning ");
 @y