Support Lua modules that don't create a global (omni completion)

xolox · Oct 16, 2011 · 3c49c27 · 3c49c27
1 parent 3855093
commit 3c49c27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/autoload/xolox/lua.vim b/autoload/xolox/lua.vim
@@ -1,9 +1,9 @@
 " Vim auto-load script
 " Author: Peter Odding <peter@peterodding.com>
-" Last Change: September 26, 2011
+" Last Change: October 16, 2011
 " URL: http://peterodding.com/code/vim/lua-ftplugin
 
-let g:xolox#lua#version = '0.6.23'
+let g:xolox#lua#version = '0.6.24'
 let s:miscdir = expand('<sfile>:p:h:h:h') . '/misc/lua-ftplugin'
 let s:omnicomplete_script = s:miscdir . '/omnicomplete.lua'
 let s:globals_script = s:miscdir . '/globals.lua'

diff --git a/misc/lua-ftplugin/omnicomplete.lua b/misc/lua-ftplugin/omnicomplete.lua
@@ -3,7 +3,7 @@
 --[[
 
 Author: Peter Odding <peter@peterodding.com>
-Last Change: July 29, 2011
+Last Change: October 16, 2011
 URL: http://peterodding.com/code/vim/lua-ftplugin
 
 This Lua script is executed by the Lua file type plug-in for Vim to provide
@@ -75,7 +75,10 @@ end
 -- Load installed modules.
 -- XXX What if module loading has side effects? It shouldn't, but still...
 for _, modulename in ipairs(arg) do
-  pcall(require, modulename)
+  local status, module = pcall(require, modulename)
+  if status and module and not _G[modulename] then
+    _G[modulename] = module
+  end
 end
 
 -- Generate completion candidates from global state.