From f8a8cd8eed4087a0febaca18f2424821f5fbea73 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Tue, 16 Apr 2013 17:46:05 +0200
Subject: fix loading

---
 lualibs-basic.lua    | 8 ++++----
 lualibs-extended.lua | 8 ++++----
 lualibs.dtx          | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lualibs-basic.lua b/lualibs-basic.lua
index 4a17bdc..883ae5f 100644
--- a/lualibs-basic.lua
+++ b/lualibs-basic.lua
@@ -21,15 +21,15 @@ end
 local loadmodule   = lualibs.loadmodule
 local stringformat = string.format
 
-local res
+local loaded = false
 if lualibs.prefer_merged then
-  res = loadmodule('lualibs-basic-merged.lua')
+  loaded = loadmodule('lualibs-basic-merged.lua')
 else
   info"Ignoring merged packages."
+  info"Falling back to individual libraries from collection “basic”."
 end
 
-if not res then
-  info(stringformat("Falling back to “%s”.", basename))
+if loaded == false then
   loadmodule("lualibs-lua.lua")
   loadmodule("lualibs-lpeg.lua")
   loadmodule("lualibs-function.lua")
diff --git a/lualibs-extended.lua b/lualibs-extended.lua
index 6b67ce2..438910b 100644
--- a/lualibs-extended.lua
+++ b/lualibs-extended.lua
@@ -120,15 +120,15 @@ end
 
 fake_context()
 
-local res
+local loaded = false
 if lualibs.prefer_merged then
-  res = loadmodule('lualibs-extended-merged.lua')
+  loaded = loadmodule('lualibs-extended-merged.lua')
 else
   info"Ignoring merged packages."
+  info"Falling back to individual libraries from collection “extended”."
 end
 
-if not res then
-  info(stringformat("Falling back to “%s”.", basename))
+if loaded == false then
   loadmodule("lualibs-util-str.lua")--- string formatters (fast)
   loadmodule("lualibs-util-tab.lua")--- extended table operations
   loadmodule("lualibs-util-sto.lua")--- storage (hash allocation)
diff --git a/lualibs.dtx b/lualibs.dtx
index e9a20a6..71f7b53 100644
--- a/lualibs.dtx
+++ b/lualibs.dtx
@@ -259,7 +259,7 @@ require("lualibs-util-sto")
 require("lualibs-util-dim")
 require("lualibs-util-jsn")
 --require("lualibs-util-mrg")-- not required
-require("lualibs-util-lua")
+--require("lualibs-util-lua")
 %    \end{macrocode}
 %
 % \iffalse
-- 
cgit v1.2.3