summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2022-05-02 17:02:40 +0200
committerContext Git Mirror Bot <phg@phi-gamma.net>2022-05-02 17:02:40 +0200
commitd2e1112ef8921f361ac7cf1b49e30923cce6d5f0 (patch)
tree0d909528bec22b69bdd671aa7fe560d5d0104021 /tex/generic
parentf740345a433f2b9736b14f61a98173763e093b6f (diff)
downloadcontext-d2e1112ef8921f361ac7cf1b49e30923cce6d5f0.tar.gz
2022-05-02 15:50:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-core.lua7
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
2 files changed, 8 insertions, 1 deletions
diff --git a/tex/generic/context/luatex/luatex-core.lua b/tex/generic/context/luatex/luatex-core.lua
index 538d8f903..66207339e 100644
--- a/tex/generic/context/luatex/luatex-core.lua
+++ b/tex/generic/context/luatex/luatex-core.lua
@@ -210,6 +210,13 @@ if saferoption == 1 or shellescape ~= 1 then
ffi = nil
+ -- A patch by LS for LaTeX per April 2022 but I'm, not sure if that breaks ConTeXt MKIV. I have
+ -- no time nor motivation to test that right now so we'll see where it breaks. We have different
+ -- loaders anyway and we don't test plain.
+
+ package.loaded .ffi = nil -- Isn't that still nil then?
+ package.preload.ffi = error -- Do errors always go there?
+
end
if md5 then
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 3c0b95c6d..c98ca8c7c 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 2022-04-20 19:15
+-- merge date : 2022-05-02 15:48
do -- begin closure to overcome local limits and interference