Merge pull request #420 from sim590/unpack-lua51-compat

util/menu_iterator: retro compatibility with lua 5.1

diff --git a/helpers.lua b/helpers.lua
index 4d75f7b6067f7eb9d5430eeac9e5cedbd785e06c..d3fa2597c22e8659c4674925c19d128ccec5fd23 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -12,7 +12,8 @@ local io         = { lines = io.lines,
                      open  = io.open }
 local pairs      = pairs
 local rawget     = rawget
-local table      = { sort  = table.sort }
+local table      = { sort  = table.sort, unpack = table.unpack }
+local unpack     = unpack or table.unpack -- lua 5.1 retro-compatibility
 
 -- Lain helper functions for internal use
 -- lain.helpers

diff --git a/util/menu_iterator.lua b/util/menu_iterator.lua
index 0ea4e0e2d2f9cdf6bf0c30fbe9b093dc66e5aeb0..9959b2589d4b40f3fedfa2453d6b87a8ece6dda9 100644 (file)
--- a/util/menu_iterator.lua
+++ b/util/menu_iterator.lua
@@ -11,12 +11,13 @@
 -- lain.util.menu_iterator
 
 local naughty = require("naughty")
+local helpers = require("lain.helpers")
 local util    = require("lain.util")
 local atable  = require("awful.util").table
 local assert  = assert
 local pairs   = pairs
 local tconcat = table.concat
-local unpack  = unpack
+local unpack = unpack or table.unpack -- lua 5.1 retro-compatibility
 
 local state = { cid = nil }