Add 20081002-1.

[ion3.git] / build / mkman.lua

diff --git a/build/mkman.lua b/build/mkman.lua
index 95f0bd92e361ea5adcdc75bcad775d1de60c0d66..da97d5036a0cd23978ecb9e450e62cb78afe1216 100644 (file)
--- a/build/mkman.lua
+++ b/build/mkman.lua
@@ -20,7 +20,7 @@ local function gettext(x)
 end
 
 local function TR(x, ...)
-    return string.format(gettext(x), unpack(arg))
+    return string.format(gettext(x), ...)
 end
 
 local function read_translations(pofile)
@@ -93,7 +93,7 @@ local function dobindings(fn, bindings)
     function p.submap(kcb_, list)
         if not list then
             return function(lst)
-                       return submap(kcb_, lst)
+                       return p.submap(kcb_, lst)
                    end
         end
         return {action = "kpress", kcb = kcb_, submap = list}
@@ -205,8 +205,11 @@ local function docgroup_bindings(bindings)
     local outi=0
     
     local function parsetable(t, prefix)
-        for _, v in ipairs(t) do
-            if not v.invalid then
+        --for _, v in ipairs(t) do
+        -- ipairs doesn't like nil values, that e.g. submap_wait dummy might generate
+        for i=1,#t do
+            local v=t[i]
+            if v and not v.invalid then
                 if v.kcb then
                     v.kcb=string.gsub(v.kcb, "AnyModifier%+", "")
                 end
@@ -311,7 +314,7 @@ local function doargs(a)
     end
 end
 
-doargs(arg)
+doargs({...})
 
 local f, err=io.open(infile)
 if not f then