From 5c015131c8c89c9bc89ffe64bb0402dadea2c42e Mon Sep 17 00:00:00 2001
From: liamDevine <unknown>
Date: Fri, 29 Apr 2011 22:56:36 +0100
Subject: [PATCH] kind is a function in _G. Changed function 'merge' to use the
 string 'kind' instead of the function for the table key.

---
 src/base/configs.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/base/configs.lua b/src/base/configs.lua
index 1cebd8b9..6be0de19 100644
--- a/src/base/configs.lua
+++ b/src/base/configs.lua
@@ -240,7 +240,7 @@
 		
 		-- add `kind` to the filter terms
 		if (cfg.kind) then 
-			terms[kind]=cfg.kind:lower()
+			terms['kind']=cfg.kind:lower()
 		end
 		
 		-- now add in any blocks that match the filter terms
@@ -248,8 +248,8 @@
 			if (premake.iskeywordsmatch(blk.keywords, terms))then
 				mergeobject(cfg, blk)
 				if (cfg.kind and not cfg.terms.kind) then 
-					cfg.terms[kind] = cfg.kind:lower()
-					terms[kind] = cfg.kind:lower()
+					cfg.terms['kind'] = cfg.kind:lower()
+					terms['kind'] = cfg.kind:lower()
 				end
 			end
 		end