diff options
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/lua_interface.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index b455f6b4..1b52855e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,6 +16,7 @@ SCI_THREAD_FLAG = LUA_CFLAGS = -DLUA_USE_LINUX TEXTADEPT = textadept TEXTADEPT_RC = +EXPORTLUASYMS = -rdynamic -Wl,--retain-symbols-file -Wl,lua.sym else CC = i486-mingw32-gcc -mms-bitfields CPP = i486-mingw32-g++ -mms-bitfields -mwindows @@ -26,6 +27,7 @@ SCI_THREAD_FLAG = -DG_THREADS_IMPL_NONE LUA_CFLAGS = -D_WIN32 -DWIN32 TEXTADEPT = textadept.exe TEXTADEPT_RC = textadept_rc.o +EXPORTLUASYMS = -Wl,--retain-symbols-file -Wl,lua.sym WINDRES = i486-mingw32-windres endif @@ -44,7 +46,6 @@ GTKFLAGS = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) \ --cflags gtk+-2.0) GTKLIBS = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) \ --libs gtk+-2.0 gthread-2.0) -EXPORTLUASYMS = -rdynamic -Wl,--retain-symbols-file -Wl,lua.sym TEXTADEPT_OBJS = textadept.o lua_interface.o LUA_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ diff --git a/src/lua_interface.c b/src/lua_interface.c index 25fc279d..d954e06e 100644 --- a/src/lua_interface.c +++ b/src/lua_interface.c @@ -579,11 +579,11 @@ static long l_toscintillaparam(lua_State *lua, int type, int *arg_idx) { return (long)lua_tostring(lua, (*arg_idx)++); else if (type == tBOOL) return lua_toboolean(lua, (*arg_idx)++); - else if (type == tKEYMOD) - return (luaL_checkinteger(lua, (*arg_idx)++) & 0xFFFF) | - ((luaL_checkinteger(lua, (*arg_idx)++) & - (SCMOD_SHIFT | SCMOD_CTRL | SCMOD_ALT)) << 16); - else if (type > tVOID && type < tBOOL) + else if (type == tKEYMOD) { + int key = luaL_checkinteger(lua, (*arg_idx)++) & 0xFFFF; + return key | ((luaL_checkinteger(lua, (*arg_idx)++) & + (SCMOD_SHIFT | SCMOD_CTRL | SCMOD_ALT)) << 16); + } else if (type > tVOID && type < tBOOL) return luaL_checklong(lua, (*arg_idx)++); else return 0; |