From 249a885f614c1b4a22a346ee564a07052a5ac2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 26 Dec 2015 14:45:24 +0100 Subject: vis: change Lua package.path to also include vis base directory --- vis-lua.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/vis-lua.c b/vis-lua.c index d597772..2e74761 100644 --- a/vis-lua.c +++ b/vis-lua.c @@ -368,10 +368,10 @@ void vis_lua_start(Vis *vis) { } /* extends lua's package.path with: - * - $VIS_PATH/lexers - * - $HOME/.vis/lexers - * - /usr/local/share/vis/lexers - * - /usr/share/vis/lexers + * - $VIS_PATH/{,lexers} + * - $HOME/.vis{,lexers} + * - /usr/local/share/vis/{,lexers} + * - /usr/share/vis/{,lexers} * - package.path (standard lua search path) */ int paths = 3; @@ -379,21 +379,25 @@ void vis_lua_start(Vis *vis) { const char *vis_path = getenv("VIS_PATH"); if (vis_path) { + lua_pushstring(L, vis_path); + lua_pushstring(L, "/?.lua;"); lua_pushstring(L, vis_path); lua_pushstring(L, "/lexers/?.lua;"); - lua_concat(L, 2); + lua_concat(L, 4); paths++; } if (home && *home) { + lua_pushstring(L, home); + lua_pushstring(L, "/.vis/?.lua;"); lua_pushstring(L, home); lua_pushstring(L, "/.vis/lexers/?.lua;"); - lua_concat(L, 2); + lua_concat(L, 4); paths++; } - lua_pushstring(L, "/usr/local/share/vis/lexers/?.lua;"); - lua_pushstring(L, "/usr/share/vis/lexers/?.lua;"); + lua_pushstring(L, "/usr/local/share/vis/?.lua;/usr/local/share/vis/lexers/?.lua"); + lua_pushstring(L, "/usr/share/vis/?.lua;/usr/share/vis/lexers/?.lua"); lua_getfield(L, -paths, "path"); lua_concat(L, paths); lua_setfield(L, -2, "path"); -- cgit v1.2.3