7 files changed, 22 insertions, 12 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 67a24c4d5..11d62d298 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2014.05.30 18:06}
+\newcontextversion{2014.05.30 23:26}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index a6d3cdd0a..a3983ea30 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 5681a5f23..22a770b9d 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.05.30 18:06}
+\edef\contextversion{2014.05.30 23:26}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/luat-cnf.lua b/tex/context/base/luat-cnf.lua
index 0f721a874..cf8a1e7e0 100644
--- a/tex/context/base/luat-cnf.lua
+++ b/tex/context/base/luat-cnf.lua
@@ -19,8 +19,10 @@ texconfig.shell_escape = 't'
 luatex       = luatex or { }
 local luatex = luatex
 
-texconfig.error_line      =   1000 --    79 -- obsolete
-texconfig.half_error_line =    500 --    50 -- obsolete
+texconfig.max_print_line  = 100000 -- frozen
+texconfig.max_in_open     =    127 -- frozen
+texconfig.error_line      =     79 -- frozen
+texconfig.half_error_line =     50 -- frozen
 
 texconfig.expand_depth    =  10000 -- 10000
 texconfig.hash_extra      = 100000 --     0
@@ -161,10 +163,17 @@ end)
 ]]
 
 local variablenames = {
-    "error_line", "half_error_line",
-    "expand_depth", "hash_extra", "nest_size",
-    "max_in_open", "max_print_line", "max_strings",
-    "param_size", "save_size", "stack_size",
+    error_line      = false,
+    half_error_line = false,
+    max_print_line  = false,
+    max_in_open     = false,
+    expand_depth    = true,
+    hash_extra      = true,
+    nest_size       = true,
+    max_strings     = true,
+    param_size      = true,
+    save_size       = true,
+    stack_size      = true,
 }
 
 local function makestub()
@@ -176,8 +185,7 @@ local function makestub()
         "-- this file is generated, don't change it\n",
         "-- configuration (can be overloaded later)\n"
     }
-    for i=1,#variablenames do
-        local v = variablenames[i]
+    for v, permitted in table.sortedhash(variablenames) do
         local d = "luatex." .. gsub(lower(v),"[^%a]","")
         local dv = directives.value(d)
         local tv = texconfig[v]
@@ -185,6 +193,8 @@ local function makestub()
             if not tv then
                 report("  %s = %s (%s)",d,dv,"configured")
                 tv = dv
+            elseif not permitted then
+                report("  %s = %s (%s)",d,tv,"frozen")
             elseif tonumber(dv) >= tonumber(tv) then
                 report("  %s = %s (%s)",d,dv,"overloaded")
                 tv = dv
@@ -192,7 +202,7 @@ local function makestub()
                 report("  %s = %s (%s)",d,tv,"preset kept")
             end
         elseif tv then
-            report("  %s = %s (%s)",d,tv,"preset")
+            report("  %s = %s (%s)",d,tv,permitted and "preset" or "frozen")
         else
             report("  %s = <unset>",d)
         end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
new file mode 100644
index 000000000..55046b375
--- /dev/null
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
new file mode 100644
index 000000000..c1435146e
--- /dev/null
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index cb188b2b3..1732a2345 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/30/14 18:06:13
+-- merge date  : 05/30/14 23:26:41
 
 do -- begin closure to overcome local limits and interference