From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- 3rdparty/lua-linenoise/linenoise.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to '3rdparty/lua-linenoise/linenoise.c') diff --git a/3rdparty/lua-linenoise/linenoise.c b/3rdparty/lua-linenoise/linenoise.c index aab7c1418ea..768d455729d 100644 --- a/3rdparty/lua-linenoise/linenoise.c +++ b/3rdparty/lua-linenoise/linenoise.c @@ -175,26 +175,12 @@ static int l_refresh(lua_State *L) return handle_ln_ok(L); } -static int l_historyget(lua_State *L) -{ - int len, i; - char **history = linenoiseHistory(&len); - lua_newtable(L); - for(i = 0; i < len; i++) - { - lua_pushstring(L, history[i]); - lua_rawseti(L, -2, i + 1); - } - return 1; -} - luaL_Reg linenoise_funcs[] = { { "linenoise", l_linenoise }, { "historyadd", l_historyadd }, { "historysetmaxlen", l_historysetmaxlen }, { "historysave", l_historysave }, { "historyload", l_historyload }, - { "historyget", l_historyget }, { "clearscreen", l_clearscreen }, { "setcompletion", l_setcompletion}, { "addcompletion", l_addcompletion }, -- cgit v1.2.3-70-g09d2