vis: try to support all lua versions >= 5.1

Make lpeg module table explicitly global, which should work
with the different module loading semantics.

4 files changed, 7 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index d953f61..b7f49be 100644
--- a/Makefile
+++ b/Makefile
@@ -163,12 +163,12 @@ dependency/sources/extract-liblua: dependency/sources/$(LIBLUA).tar.gz
 	touch $@
 
 dependency/sources/patch-liblua: dependency/sources/extract-liblua
-	cd $(dir $<) && ([ -e lua-5.1.4-lpeg.patch ] || wget http://www.brain-dump.org/projects/vis/lua-5.1.4-lpeg.patch)
-	cd $(dir $<)/$(LIBLUA) && patch -p1 < ../lua-5.1.4-lpeg.patch
+	cd $(dir $<) && ([ -e $(LIBLUA)-lpeg.patch ] || wget http://www.brain-dump.org/projects/vis/$(LIBLUA)-lpeg.patch)
+	cd $(dir $<)/$(LIBLUA) && patch -p1 < ../$(LIBLUA)-lpeg.patch
 	touch $@
 
 dependency/sources/build-liblua: dependency/sources/patch-liblua dependency/sources/install-liblpeg
-	make -C $(dir $<)/$(LIBLUA)/src all CC=$(CC) MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -fPIC" MYLIBS="-Wl,-E -ldl -lncursesw -lm"
+	make -C $(dir $<)/$(LIBLUA)/src all CC=$(CC) MYCFLAGS="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL -DLUA_USE_POSIX -DLUA_USE_DLOPEN -fPIC" MYLIBS="-Wl,-E -ldl -lncursesw -lm"
 	#make -C $(dir $<)/$(LIBLUA) posix CC=$(CC)
 	touch $@
 
@@ -198,7 +198,7 @@ dependencies: dependency/sources/install-libtermkey dependency/sources/install-l
 dependencies-full: dependency/sources/install-libncurses dependencies
 
 local: dependencies
-	CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" make
+	CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" make CFLAGS_LUA= CFLAGS_TERMKEY= LDFLAGS_LUA=-llua LDFLAGS_TERMKEY=-ltermkey
 	@echo Run with: LD_LIBRARY_PATH=$(DEPS_LIB) ./vis
 
 standalone: dependency/sources/install-libmusl
diff --git a/config.mk b/config.mk
index e69c821..58cc573 100644
--- a/config.mk
+++ b/config.mk
@@ -61,7 +61,7 @@ endif
 CFLAGS_LIBS = $(CFLAGS_LUA) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES)
 LDFLAGS_LIBS = $(LDFLAGS_LUA) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LIBS)
 
-CFLAGS_VIS = $(CFLAGS_LIBS) -std=c99 -Os -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
+CFLAGS_VIS = $(CFLAGS_LIBS) -std=c99 -Os -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL
 LDFLAGS_VIS = $(LDFLAGS_LIBS)
 
 DEBUG_CFLAGS_VIS = ${CFLAGS_VIS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter
diff --git a/lexers/lexer.lua b/lexers/lexer.lua
index 4d7eb60..371a226 100644
--- a/lexers/lexer.lua
+++ b/lexers/lexer.lua
@@ -853,7 +853,7 @@ local M = {}
 --   Table of style names at positions in the buffer starting from zero.
 module('lexer')]=]
 
-local lpeg = require('lpeg')
+lpeg = require('lpeg')
 local lpeg_P, lpeg_R, lpeg_S, lpeg_V = lpeg.P, lpeg.R, lpeg.S, lpeg.V
 local lpeg_Ct, lpeg_Cc, lpeg_Cp = lpeg.Ct, lpeg.Cc, lpeg.Cp
 local lpeg_Cmt, lpeg_C = lpeg.Cmt, lpeg.C
diff --git a/vis.c b/vis.c
index d075f8a..12f3b19 100644
--- a/vis.c
+++ b/vis.c
@@ -308,7 +308,7 @@ Vis *vis_new(Ui *ui) {
 	Vis *vis = calloc(1, sizeof(Vis));
 	if (!vis)
 		return NULL;
-	lua_State *L = lua_open();
+	lua_State *L = luaL_newstate();
 	if (!(vis->lua = L))
 		goto err;
 	luaL_openlibs(L);