aboutsummaryrefslogtreecommitdiff
path: root/vis-lua.c
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2017-05-27 20:15:19 +0200
committerMarc André Tanner <mat@brain-dump.org>2017-05-27 20:20:30 +0200
commit25bc0ce529835cd9c46058a6dd1026c0bc247461 (patch)
treef7f7b696695cd60e046b45665c6a4f7a7059b102 /vis-lua.c
parente7bfcf4fe6480e217e972889f69e1c44c4057c97 (diff)
downloadvis-25bc0ce529835cd9c46058a6dd1026c0bc247461.tar.gz
vis-25bc0ce529835cd9c46058a6dd1026c0bc247461.tar.xz
vis-lua: avoid nil values in table returned by vis:mapping
Also fix compilation with ./configure --disable-help.
Diffstat (limited to 'vis-lua.c')
-rw-r--r--vis-lua.c3
1 files changed, 2 insertions, 1 deletions
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;