diff options
| -rw-r--r-- | core/keys.lua | 14 | ||||
| -rw-r--r-- | modules/textadept/editing.lua | 2 | ||||
| -rwxr-xr-x | scripts/gen_iface.lua | 2 | ||||
| -rw-r--r-- | src/textadept.c | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/core/keys.lua b/core/keys.lua index 4c84dbce..a4ebe7bd 100644 --- a/core/keys.lua +++ b/core/keys.lua @@ -183,12 +183,11 @@ M.keychain = setmetatable({}, { }) -- Clears the current key sequence. -local function clear_key_sequence() +-- This is also used by *modules/textadept/command_entry.lua*. +M.clear_key_sequence = function() -- Clearing a table is faster than re-creating one. if #keychain == 1 then keychain[1] = nil else keychain = {} end end --- Export for command_entry.lua without creating LuaDoc. -if CURSES then M.clear_key_sequence = clear_key_sequence end local none = {} local function key_error(e) events.emit(events.ERROR, e) end @@ -197,7 +196,7 @@ local function key_error(e) events.emit(events.ERROR, e) end -- @param command A function or table as described above. -- @param command_type Equivalent to `type(command)`. -- @return the value the command returns. -local function run_command(command, command_type) +M.run_command = function(command, command_type) local f, args = command_type == 'function' and command or command[1], none if command_type == 'table' then args = command @@ -214,7 +213,6 @@ local function run_command(command, command_type) local _, result = xpcall(f, key_error, table.unpack(args, 2)) return result end -M.run_command = run_command -- export for menu.lua without creating LuaDoc -- Return codes for `key_command()`. local INVALID, PROPAGATE, CHAIN, HALT = -1, 0, 1, 2 @@ -234,7 +232,7 @@ local function key_command(prefix) ui.statusbar_text = _L['Keychain:']..' '..table.concat(keychain, ' ') return CHAIN end - return run_command(key, key_type) == false and PROPAGATE or HALT + return M.run_command(key, key_type) == false and PROPAGATE or HALT end -- Handles Textadept keypresses. @@ -260,7 +258,7 @@ local function keypress(code, shift, control, alt, meta) --if CURSES then ui.statusbar_text = '"'..key_seq..'"' end local keychain_size = #keychain if keychain_size > 0 and key_seq == M.CLEAR then - clear_key_sequence() + M.clear_key_sequence() return true end keychain[keychain_size + 1] = key_seq @@ -272,7 +270,7 @@ local function keypress(code, shift, control, alt, meta) else status = key_command(M.MODE) end - if status ~= CHAIN then clear_key_sequence() end + if status ~= CHAIN then M.clear_key_sequence() end if status > PROPAGATE then return true end -- CHAIN or HALT if status == INVALID and keychain_size > 0 then ui.statusbar_text = _L['Invalid sequence'] diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua index d5d78ac6..883cbabc 100644 --- a/modules/textadept/editing.lua +++ b/modules/textadept/editing.lua @@ -189,7 +189,7 @@ events.connect(events.CHAR_ADDED, function(char) while i >= 0 and buffer:get_line(i):find('^[\r\n]+$') do i = i - 1 end if i >= 0 then buffer.line_indentation[line] = buffer.line_indentation[i] - buffer:goto_pos(buffer.line_indent_position[line]) + buffer:vc_home() end end) diff --git a/scripts/gen_iface.lua b/scripts/gen_iface.lua index 73fc8f5e..351ebeb3 100755 --- a/scripts/gen_iface.lua +++ b/scripts/gen_iface.lua @@ -67,7 +67,7 @@ local events = { SCN_SAVEPOINTLEFT = 2003, SCN_MODIFYATTEMPTRO = 2004, SCN_KEY = 2005, - SCN_DOUBLECLICK =2006, + SCN_DOUBLECLICK = 2006, SCN_UPDATEUI = 2007, SCN_MODIFIED = 2008, SCN_MACRORECORD = 2009, diff --git a/src/textadept.c b/src/textadept.c index 2c600181..b6d90a86 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -1923,7 +1923,7 @@ static void lL_notify(lua_State *L, struct SCNotification *n) { //lua_pushinteger(L, n->linesAdded), lua_setfield(L, -2, "lines_added"); //lua_pushinteger(L, n->message), lua_setfield(L, -2, "message"); lua_pushinteger(L, n->wParam), lua_setfield(L, -2, "wParam"); - lua_pushinteger(L, n->lParam), lua_setfield(L, -2, "lParam"); + //lua_pushinteger(L, n->lParam), lua_setfield(L, -2, "lParam"); lua_pushinteger(L, n->line), lua_setfield(L, -2, "line"); //lua_pushinteger(L, n->foldLevelNow), lua_setfield(L, -2, "fold_level_now"); //lua_pushinteger(L, n->foldLevelPrev); |