Merge pull request #2 from akfidjeland/topic-path-order

Changed the path and cpath order

1 files changed, 6 insertions, 0 deletions

diff --git a/init.lua b/init.lua
index 419e291..a0acb6d 100644
--- a/init.lua
+++ b/init.lua
@@ -280,6 +280,8 @@ if paths.dirp(localinstalldir) then
    package.cpath = paths.concat(localinstalldir,'lib','lua','5.1','?.dylib') .. ';' .. package.cpath
 end
 
+local origpath = package.path
+local origcpath = package.cpath
 
 function loaddefaultlibs(loadwithimport)
    if loadwithimport == nil then loadwithimport = false end
@@ -298,6 +300,10 @@ end
 local loadwithimport = false
 loaddefaultlibs(loadwithimport)
 
+-- undo path manipulation performed by dok
+package.path = origpath
+package.cpath = origcpath
+
 _G._preloaded_ = {}
 for k,v in pairs(_G) do
    _G._preloaded_[k] = true