From 25bc0ce529835cd9c46058a6dd1026c0bc247461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 27 May 2017 20:15:19 +0200 Subject: vis-lua: avoid nil values in table returned by vis:mapping Also fix compilation with ./configure --disable-help. --- vis-lua.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vis-lua.c') diff --git a/vis-lua.c b/vis-lua.c index 6d17a1e..8aaa2ed 100644 --- a/vis-lua.c +++ b/vis-lua.c @@ -951,7 +951,8 @@ static bool binding_collect(const char *key, void *value, void *ctx) { bool new = lua_isnil(L, -1); lua_pop(L, 1); if (new) { - lua_pushstring(L, binding->alias ? binding->alias : binding->action->help); + const char *help = binding->alias ? binding->alias : VIS_HELP_USE(binding->action->help); + lua_pushstring(L, help ? help : ""); lua_setfield(L, -2, key); } return true; -- cgit v1.2.3