diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-10-02 20:20:06 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-10-02 20:20:06 +0000 |
commit | 0bca632227a3dc29bac856270b6eeb057562085b (patch) | |
tree | 0258c6ac4bfbd9e6f95e785c2704ca1d746834bf /Build/source/texk/web2c/luatexdir/tex | |
parent | e6cd6c530ce989620664cc8478e31acd72c98030 (diff) |
luatex: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@64585 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/errors.c | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/mainbody.c | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/mainbody.h | 1 |
3 files changed, 12 insertions, 0 deletions
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; |