[latex3-commits] [git/LaTeX3-latex3-latex3] master: Bail out inside hbox for fatal error (fixes #587) (2c5b4aa)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/2c5b4aa678bc9fdd103e37f77bd9d49de54bfd5d

>---------------------------------------------------------------

commit 2c5b4aa678bc9fdd103e37f77bd9d49de54bfd5d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Jun 3 13:55:33 2019 +0100

    Bail out inside hbox for fatal error (fixes #587)


>---------------------------------------------------------------

2c5b4aa678bc9fdd103e37f77bd9d49de54bfd5d
 l3kernel/CHANGELOG.md |    2 ++
 l3kernel/l3msg.dtx    |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 92bb9a8..b5cee0f 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -14,6 +14,8 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Changed
 
+- Ensure `\msg_fatal:nn` ends the TeX run if used inside an
+  hbox (see #587)
 - Moved driver code to internal for each 'parent' module
 
 ## [2019-05-28]
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 4f3d8a6..08eaaa9 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -976,7 +976,7 @@
         {#1}
         { \use:c { \c_@@_text_prefix_tl #1 / #2 } {#3} {#4} {#5} {#6} }
         { \c_@@_fatal_text_tl }
-      \tex_end:D
+      \tex_vbox:D { \tex_batchmode:D \tex_end:D }
     }
 %    \end{macrocode}
 % \end{macro}