summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-22 18:09:43 +0000
committerKarl Berry <karl@freefriends.org>2021-07-22 18:09:43 +0000
commit768fb884b589b3dab20225db95c167320aa65ec2 (patch)
tree44e26b81e58691fe301b85f6b6afabae7912e18b
parentdd88e6250c7d2d3b3cba99f772c5a68d1208179a (diff)
explicit fmt loading error when strings are different
git-svn-id: svn://tug.org/texlive/trunk@60013 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog6
-rw-r--r--Build/source/texk/web2c/tex.ch5
2 files changed, 9 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 6162e33717f..3c75fe0f976 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-22 Karl Berry <karl@freefriends.org>
+
+ * tex.ch (50.1308): when fmt loading fails because the string
+ checksums are different, say that explicitly, not just
+ "different executable".
+
2021-07-19 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* tex.ch (term_input, @<Input for \.{\\read} from the terminal@>):
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index f281540a7da..0586d75cd83 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -3512,7 +3512,8 @@ undump_things(format_engine[0], x);
format_engine[x-1]:=0; {force string termination, just in case}
if strcmp(engine_name, stringcast(format_engine)) then
begin wake_up_terminal;
- wterm_ln('---! ', stringcast(name_of_file+1), ' was written by ', format_engine);
+ wterm_ln('---! ', stringcast(name_of_file+1), ' was written by ',
+ format_engine);
libc_free(format_engine);
goto bad_fmt;
end;
@@ -3522,7 +3523,7 @@ format_debug('string pool checksum')(x);
if x<>@$ then begin {check that strings are the same}
wake_up_terminal;
wterm_ln('---! ', stringcast(name_of_file+1),
- ' made by different executable version');
+ ' made by different executable, strings are different');
goto bad_fmt;
end;
@<Undump |xord|, |xchr|, and |xprn|@>;