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. --- plugins/console/init.lua | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'plugins/console/init.lua') diff --git a/plugins/console/init.lua b/plugins/console/init.lua index 52d54fdcc1a..3cb75f55528 100644 --- a/plugins/console/init.lua +++ b/plugins/console/init.lua @@ -18,16 +18,6 @@ function console.startplugin() local matches = {} local lastindex = 0 local consolebuf - _G.history = function (index) - local history = ln.historyget() - if index then - ln.preload(history[index]) - return - end - for num, line in ipairs(history) do - print(num, line) - end - end print(" _/ _/ _/_/ _/ _/ _/_/_/_/"); print(" _/_/ _/_/ _/ _/ _/_/ _/_/ _/ "); print(" _/ _/ _/ _/_/_/_/ _/ _/ _/ _/_/_/ "); @@ -38,7 +28,7 @@ function console.startplugin() -- linenoise isn't thread safe but that means history can handled here -- that also means that bad things will happen if anything outside lua tries to use it -- especially the completion callback - ln.historysetmaxlen(50) + ln.historysetmaxlen(10) local scr = [[ local ln = require('linenoise') ln.setcompletion(function(c, str, pos) -- cgit v1.2.3-70-g09d2