Include my new "lspawn" module by default for spawning processes.

The `textadept.run` module now uses `spawn()` instead of `io.popen()`.
This module replaces the dependency on winapi. Removed experimental
`io.popen()` and `os.execute()` hooks. They may be re-implemented later using
`spawn()`.

3 files changed, 29 insertions, 489 deletions

diff --git a/src/Makefile b/src/Makefile
index c4452619..563fdfe6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,6 +33,9 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel))))
       GTK_LIBS = $(shell PKG_CONFIG_PATH=`pwd`/$(arch)gtk/lib/pkgconfig \
                          pkg-config --define-variable=prefix=$(arch)gtk \
                          --libs gtk+-2.0)
+      GLIB_CFLAGS = $(shell PKG_CONFIG_PATH=`pwd`/$(arch)gtk/lib/pkgconfig \
+                            pkg-config --define-variable=prefix=$(arch)gtk \
+                            --cflags glib-2.0)
     else
       plat_flag = -DCURSES
       CURSES_CFLAGS = -DLIBICONV_STATIC -I$(arch)curses/include
@@ -62,6 +65,9 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel))))
                          pkg-config --define-variable=prefix=gtkosx \
                          --libs gtk+-2.0 gmodule-2.0 gtk-mac-integration) \
                          -framework Cocoa
+      GLIB_CFLAGS = $(shell PKG_CONFIG_PATH=`pwd`/gtkosx/lib/pkgconfig \
+                            pkg-config --define-variable=prefix=gtkosx \
+                            --cflags glib-2.0)
     else
       plat_flag = -DCURSES -D_XOPEN_SOURCE_EXTENDED
       CURSES_LIBS = -lncurses
@@ -98,6 +104,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel))))
       endif
       GTK_CFLAGS = $(shell pkg-config --cflags gtk+-$(gtk_version) gmodule-2.0)
       GTK_LIBS = $(shell pkg-config --libs gtk+-$(gtk_version) gmodule-2.0)
+      GLIB_CFLAGS = $(shell pkg-config --cflags glib-2.0)
       install_targets = ../textadept ../textadeptjit
     else
       plat_flag = -DCURSES -D_XOPEN_SOURCE_EXTENDED
@@ -175,16 +182,11 @@ lua_objs = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o \
            lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o \
            lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
            lmathlib.o loadlib.o loslib.o ltablib.o lstrlib.o
-lua_lib_objs = lpeg.o lfs.o
+lua_lib_objs = lpeg.o lfs.o lspawn.o
 #lua_lib_objs = lpcap.o lpcode.o lpprint.o lptree.o lpvm.o lfs.o
-luajit_lib_objs = lpegjit.o lfsjit.o
+luajit_lib_objs = lpegjit.o lfsjit.o lspawnjit.o
 #luajit_lib_objs = lpcapjit.o lpcodejit.o lpprintjit.o lptreejit.o lpvmjit.o \
 #                  lfsjit.o
-ifeq (win, $(findstring win, $(MAKECMDGOALS)))
-	# Compile in winapi module for Windows.
-	lua_lib_objs += wutils.o winapi.o
-	luajit_lib_objs += wutilsjit.o winapijit.o
-endif
 termkey_objs = termkey.o driver-ti.o driver-csi.o
 windowman_objs = windowman.o
 cdk_objs = binding.o buttonbox.o button.o cdk.o cdk_display.o cdk_objs.o \
@@ -248,9 +250,9 @@ textadeptjit-curses.o: textadept.c
 $(lua_objs): %.o: lua/src/%.c
 	$(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Ilua/src $< -o $@
 $(lua_lib_objs): %.o: lua/src/lib/%.c
-	$(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Ilua/src $< -o $@
+	$(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Ilua/src $(GLIB_CFLAGS) $< -o $@
 $(luajit_lib_objs): %jit.o: lua/src/lib/%.c
-	$(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Iluajit/src $< -o $@
+	$(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Iluajit/src $(GLIB_CFLAGS) $< -o $@
 luajit/src/libluajit.a: ; $(MAKE) -C luajit CC="$(CC) $(CFLAGS)"
 luajit/src/lua51.dll:
 	$(MAKE) -C luajit HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Windows
@@ -431,7 +433,7 @@ scintillua_zip = scintillua.zip
 lua_tgz = lua-5.2.3.tar.gz
 lpeg_tgz = lpeg-0.10.2.tar.gz
 lfs_zip = d71c63cdb776f7d25313f8fcd14f07512ba1f83e.zip
-lwinapi_zip = 23dd43141d04d010a9986cca9e5ecb9e598a2899.zip
+lspawn_zip = lspawn.zip
 luajit_tgz = LuaJIT-2.0.3.tar.gz
 libluajit_tgz = libluajit_2.0.3.x86_64.tgz
 gtdialog_zip = gtdialog.zip
@@ -463,19 +465,18 @@ $(lua_tgz): ; wget "http://www.lua.org/ftp/$@"
 $(lpeg_tgz): ; wget "http://www.inf.puc-rio.br/~roberto/lpeg/$@"
 $(lfs_zip):
 	wget "https://github.com/keplerproject/luafilesystem/archive/$@" -O $@
-$(lwinapi_zip): ; wget "https://github.com/stevedonovan/winapi/archive/$@" -O $@
+$(lspawn_zip): ; wget "http://foicica.com/hg/lspawn/archive/tip.zip" -O $@
 lua: lua.patch | $(lua_tgz)
 	mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@
 	patch -d $@ -N -p1 < $<
-lualibs: lua/src/lib/lpeg lua/src/lib/lfs lua/src/lib/winapi
+lualibs: lua/src/lib/lpeg lua/src/lib/lfs lua/src/lib/lspawn
 lua/src/lib/lpeg: | $(lpeg_tgz)
 	mkdir -p $@ && tar xzf $| -C $@ && mv $@/*/*.c $@/*/*.h $(dir $@)
 lua/src/lib/lfs: lfs.patch | $(lfs_zip)
 	mkdir -p $@ && unzip -d $@ $| && mv $@/*/src/*.c $@/*/src/*.h $(dir $@)
 	patch -d $(dir $@) -N -p1 < $<
-lua/src/lib/winapi: winapi.patch | $(lwinapi_zip)
-	mkdir -p $@ && unzip -d $@ $| && mv $@/*/*.c $@/*/*.h $(dir $@)
-	patch -d $(dir $@) -N --binary -p1 < $<
+lua/src/lib/lspawn: | $(lspawn_zip)
+	mkdir -p $@ && unzip -d $@ $| && mv $@/*/*.c $(dir $@)
 $(luajit_tgz): ; wget "http://luajit.org/download/$@"
 luajit: luajit.patch | $(luajit_tgz)
 	mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@
diff --git a/src/textadept.c b/src/textadept.c
index 9b5a789a..d3d1dd67 100644
--- a/src/textadept.c
+++ b/src/textadept.c
@@ -13,9 +13,7 @@
 #elif _WIN32
 #include <windows.h>
 #define main main_
-#elif (__APPLE__ && !CURSES)
-#include <gtkmacintegration/gtkosxapplication.h>
-#elif (__APPLE__ && CURSES)
+#elif __APPLE__
 #include <mach-o/dyld.h>
 #elif (__FreeBSD__ || __NetBSD__ || __OpenBSD__)
 #define u_int unsigned int // 'u_int' undefined when _POSIX_SOURCE is defined
@@ -25,6 +23,9 @@
 #if GTK
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#if __APPLE__
+#include <gtkmacintegration/gtkosxapplication.h>
+#endif
 #elif CURSES
 #if !_WIN32
 #include <signal.h>
@@ -92,7 +93,6 @@ typedef GtkWidget Scintilla;
 #define LUA_OK 0
 #define lua_rawlen lua_objlen
 #define LUA_OPEQ 0
-#define lua_compare(l, a, b, _) lua_equal(l, a, b)
 #define lL_openlib(l, n, f) \
   (lua_pushcfunction(l, f), lua_pushstring(l, n), lua_call(l, 1, 0))
 #else
@@ -210,9 +210,7 @@ static void new_buffer(sptr_t);
 static Scintilla *new_view(sptr_t);
 static int lL_init(lua_State *, int, char **, int);
 LUALIB_API int luaopen_lpeg(lua_State *), luaopen_lfs(lua_State *);
-#if _WIN32
-LUALIB_API int luaopen_winapi(lua_State *);
-#endif
+LUALIB_API int luaopen_spawn(lua_State *);
 
 /**
  * Emits an event.
@@ -1061,7 +1059,7 @@ static int lui__newindex(lua_State *L) {
 static sptr_t l_globaldoccompare(lua_State *L, int index) {
   luaL_getmetatable(L, "ta_buffer");
   lua_getmetatable(L, (index > 0) ? index : index - 1);
-  luaL_argcheck(L, lua_compare(L, -1, -2, LUA_OPEQ), index, "Buffer expected");
+  luaL_argcheck(L, lua_rawequal(L, -1, -2), index, "Buffer expected");
   lua_getfield(L, (index > 0) ? index : index - 2, "doc_pointer");
   sptr_t doc = (sptr_t)lua_touserdata(L, -1);
   lua_pop(L, 3); // doc_pointer, metatable, metatable
@@ -1305,7 +1303,7 @@ static int lbuf_property(lua_State *L) {
   int newindex = (lua_gettop(L) == 3);
   luaL_getmetatable(L, "ta_buffer");
   lua_getmetatable(L, 1); // metatable can be either ta_buffer or ta_bufferp
-  int is_buffer = lua_compare(L, -1, -2, LUA_OPEQ);
+  int is_buffer = lua_rawequal(L, -1, -2);
   lua_pop(L, 2); // metatable, metatable
 
   // If the key is a Scintilla function, return a callable closure.
@@ -1605,6 +1603,7 @@ static int lL_init(lua_State *L, int argc, char **argv, int reinit) {
   luaL_openlibs(L);
   lL_openlib(L, "lpeg", luaopen_lpeg);
   lL_openlib(L, "lfs", luaopen_lfs);
+  lL_openlib(L, "spawn", luaopen_spawn);
 
   lua_newtable(L);
   lua_newtable(L);
@@ -1644,7 +1643,6 @@ static int lL_init(lua_State *L, int argc, char **argv, int reinit) {
   lua_pushstring(L, textadept_home), lua_setglobal(L, "_HOME");
 #if _WIN32
   lua_pushboolean(L, 1), lua_setglobal(L, "WIN32");
-  lL_openlib(L, "winapi", luaopen_winapi);
 #elif (__APPLE__ && !CURSES)
   lua_pushboolean(L, 1), lua_setglobal(L, "OSX");
 #endif
@@ -1970,7 +1968,7 @@ static int s_buttonpress(GtkWidget*_, GdkEventButton *event, void*__) {
 static Scintilla *lL_checkview(lua_State *L, int arg) {
   luaL_getmetatable(L, "ta_view");
   lua_getmetatable(L, arg);
-  luaL_argcheck(L, lua_compare(L, -1, -2, LUA_OPEQ), arg, "View expected");
+  luaL_argcheck(L, lua_rawequal(L, -1, -2), arg, "View expected");
   lua_getfield(L, (arg > 0) ? arg : arg - 2, "widget_pointer");
   Scintilla *view = (Scintilla *)lua_touserdata(L, -1);
   lua_pop(L, 3); // widget_pointer, metatable, metatable
@@ -2398,19 +2396,16 @@ int main(int argc, char **argv) {
   textadept_home = malloc(FILENAME_MAX);
   GetModuleFileName(0, textadept_home, FILENAME_MAX);
   if ((last_slash = strrchr(textadept_home, '\\'))) *last_slash = '\0';
-#elif (__APPLE__ && !CURSES)
-  osxapp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
-  char *path = gtkosx_application_get_resource_path();
-  textadept_home = g_filename_from_utf8((const char *)path, -1, NULL, NULL,
-                                        NULL);
-  g_free(path);
-#elif (__APPLE__ && CURSES)
+#elif __APPLE__
   char *path = malloc(FILENAME_MAX), *p = NULL;
   uint32_t size = FILENAME_MAX;
   _NSGetExecutablePath(path, &size);
   textadept_home = realpath(path, NULL);
   p = strstr(textadept_home, "MacOS"), strcpy(p, "Resources\0");
   free(path);
+#if !CURSES
+  osxapp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
+#endif
 #elif (__FreeBSD__ || __NetBSD__ || __OpenBSD__)
   textadept_home = malloc(FILENAME_MAX);
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
diff --git a/src/winapi.patch b/src/winapi.patch
deleted file mode 100644
index 1303a538..00000000
--- a/src/winapi.patch
+++ /dev/null
@@ -1,456 +0,0 @@
---- a/winapi.c	2012-06-28 04:50:56.000000000 -0400
-+++ b/winapi.c	2013-12-13 09:14:05.006746200 -0500
-@@ -20,7 +20,7 @@
- #ifdef __GNUC__

- #include <winable.h> /* GNU GCC specific */

- #endif

--#include "Winnetwk.h"

-+#include "winnetwk.h"

- #include <psapi.h>

- 

- 

-@@ -65,6 +65,7 @@
-   return wstring_buff(text,wbuff,sizeof(wbuff));

- }

- 

-+#if 0

- /// Text encoding.

- // @section encoding

- 

-@@ -768,7 +769,9 @@
-   return push_bool(L, MoveFile(src,dest));

- }

- 

-+#endif

- #define wconv(name) (name ? wstring_buff(name,w##name,sizeof(w##name)) : NULL)

-+#if 0

- 

- /// execute a shell command.

- // @param verb the action (e.g. 'open' or 'edit') can be nil.

-@@ -891,6 +894,7 @@
-   }

-   return push_new_File(L,hSerial,hSerial);

- }

-+#endif

- 

- static int push_wait_result(lua_State *L, DWORD res) {

-   if (res == WAIT_OBJECT_0) {

-@@ -918,6 +922,7 @@
-     return push_wait_result(L,wait_single(h,timeout));

- }

- 

-+#if 0

- static int push_wait_async(lua_State *L, HANDLE h, int timeout, int callback);

- 

- /// The Event class.

-@@ -1128,6 +1133,7 @@
-   #line 825 "winapi.l.c"

-   return push_new_Mutex(L,CreateMutex(NULL,FALSE,*name==0 ? NULL : name));

- }

-+#endif

- 

- /// A class representing a Windows process.

- // this example was [helpful](http://msdn.microsoft.com/en-us/library/ms682623%28VS.85%29.aspx)

-@@ -1179,6 +1185,7 @@
-     }

-   }

- 

-+#if 0

-   /// get the name of the process.

-   // @param full true if you want the full path; otherwise returns the base name.

-   // @function get_process_name

-@@ -1210,6 +1217,7 @@
-     lua_pushnumber(L, this->pid);

- 	return 1;

-   }

-+#endif

- 

-   /// kill the process.

-   // @{test-spawn.lua} kills a launched process after a certain amount of output.

-@@ -1221,6 +1229,7 @@
-     return 0;

-   }

- 

-+#if 0

-   /// get the working size of the process.

-   // @return minimum working set size

-   // @return maximum working set size.

-@@ -1280,6 +1289,7 @@
-     lua_pushnumber(L,fileTimeToMillisec(&kernel));

-     return 2;

-   }

-+#endif

- 

-   /// wait for this process to finish.

-   // @param timeout optional timeout in millisec; defaults to waiting indefinitely.

-@@ -1293,6 +1303,7 @@
-     return push_wait(L,this->hProcess, TIMEOUT(timeout));

-   }

- 

-+#if 0

-   /// run callback when this process is finished.

-   // @param callback the callback

-   // @param timeout optional timeout in millisec; defaults to waiting indefinitely.

-@@ -1320,6 +1331,7 @@
-     #line 968 "winapi.l.c"

-     return push_wait_result(L, WaitForInputIdle(this->hProcess, TIMEOUT(timeout)));

-   }

-+#endif

- 

-   /// exit code of this process.

-   // (Only makes sense if the process has in fact finished.)

-@@ -1354,15 +1366,21 @@
- #line 995 "winapi.l.c"

- 

- static const struct luaL_Reg Process_methods [] = {

-+#if 0

-      {"get_process_name",l_Process_get_process_name},

-    {"get_pid",l_Process_get_pid},

-+#endif

-    {"kill",l_Process_kill},

-+#if 0

-    {"get_working_size",l_Process_get_working_size},

-    {"get_start_time",l_Process_get_start_time},

-    {"get_run_times",l_Process_get_run_times},

-+#endif

-    {"wait",l_Process_wait},

-+#if 0

-    {"wait_async",l_Process_wait_async},

-    {"wait_for_input_idle",l_Process_wait_for_input_idle},

-+#endif

-    {"get_exit_code",l_Process_get_exit_code},

-    {"close",l_Process_close},

-    {"__gc",l_Process___gc},

-@@ -1388,6 +1406,7 @@
- // @{readme.md.Creating_and_working_with_Processes}

- // @section Processes

- 

-+#if 0

- /// create a process object from the id.

- // @param pid the process id

- // @return @{Process}

-@@ -1477,6 +1496,7 @@
-     return 1;

-   }

- }

-+#endif

- 

- // These functions are all run in background threads, and a little bit of poor man's

- // OOP helps here. This is the base struct for describing threads with callbacks,

-@@ -1493,6 +1513,7 @@
-   callback_data_

- } LuaCallback, *PLuaCallback;

- 

-+#if 0

- LuaCallback *lcb_callback(void *lcb, lua_State *L, int idx) {

-   LuaCallback *data;

-   if (lcb == NULL) {

-@@ -1510,6 +1531,7 @@
-   LuaCallback *lcb = (LuaCallback*)data;

-   return call_lua(lcb->L,lcb->callback,idx,text,persist);

- }

-+#endif

- 

- void lcb_allocate_buffer(void *data, int size) {

-   LuaCallback *lcb = (LuaCallback*)data;

-@@ -1535,6 +1557,7 @@
- #define lcb_bufsz(data) ((LuaCallback *)data)->bufsz

- #define lcb_handle(data) ((LuaCallback *)data)->handle

- 

-+#if 0

- /// Thread object. This is returned by the @{File:read_async} method and the @{make_timer},

- // @{make_pipe_server} and @{watch_for_file_changes} functions. Useful to kill a thread

- // and free associated resources.

-@@ -1707,6 +1730,7 @@
-   lcb->bufsz = timeout;

-   return lcb_new_thread((TCB)handle_waiter,lcb);

- }

-+#endif

- 

- /// this represents a raw Windows file handle.

- // The write handle may be distinct from the read handle.

-@@ -1785,6 +1809,7 @@
-     }

-   }

- 

-+#if 0

-   static void file_reader (File *this) { // background reader thread

-     int n;

-     do {

-@@ -1806,6 +1831,7 @@
-     this->callback = make_ref(L,callback);

-     return lcb_new_thread((TCB)&file_reader,this);

-   }

-+#endif

- 

-   static int l_File_close(lua_State *L) {

-     File *this = File_arg(L,1);

-@@ -1827,7 +1853,9 @@
- static const struct luaL_Reg File_methods [] = {

-      {"write",l_File_write},

-    {"read",l_File_read},

-+#if 0

-    {"read_async",l_File_read_async},

-+#endif

-    {"close",l_File_close},

-    {"__gc",l_File___gc},

-   {NULL, NULL}  /* sentinel */

-@@ -1853,6 +1881,7 @@
- /// Launching processes.

- // @section Launch

- 

-+#if 0

- /// set an environment variable for any child processes.

- // @{setenv.lua} shows how this also affects processes

- // launched with @{os.execute}

-@@ -1869,6 +1898,7 @@
-   WCHAR wname[256],wvalue[MAX_WPATH];

-   return push_bool(L, SetEnvironmentVariableW(wconv(name),wconv(value)));

- }

-+#endif

- 

- /// Spawn a process.

- // @param program the command-line (program + parameters)

-@@ -1938,6 +1968,7 @@
-   }

- }

- 

-+#if 0

- /// execute a system command.

- // This is like `os.execute()`, except that it works without ugly

- // console flashing in Windows GUI applications. It additionally

-@@ -2564,11 +2595,28 @@
-     return push_error(L);

-   }

- }

-+#endif

- 

- #line 2005 "winapi.l.c"

- static const char *lua_code_block = ""\

-   "function winapi.execute(cmd,unicode)\n"\

-   "  local comspec = os.getenv('COMSPEC')\n"\

-+  "  cmd = comspec ..' /c '..cmd\n"\

-+  "  local P,f = winapi.spawn_process(cmd)\n"\

-+  "  if not P then return nil,f end\n"\

-+  "  local txt = f:read()\n"\

-+  "  local out = {}\n"\

-+  "  while txt do\n"\

-+  "    table.insert(out,txt)\n"\

-+  "    txt = f:read()\n"\

-+  "  end\n"\

-+  "  return P:wait():get_exit_code(),table.concat(out,'')\n"\

-+  "end\n"\

-+;

-+#if 0

-+static const char *lua_code_block = ""\

-+  "function winapi.execute(cmd,unicode)\n"\

-+  "  local comspec = os.getenv('COMSPEC')\n"\

-   "  if unicode ~= 'unicode' then\n"\

-   "    cmd = comspec ..' /c '..cmd\n"\

-   "    local P,f = winapi.spawn_process(cmd)\n"\

-@@ -2638,11 +2686,13 @@
-   "end\n"\

-   "function winapi.dirs(mask,subdirs) return winapi.files(mask,subdirs,'D') end\n"\

- ;

-+#endif

- static void load_lua_code (lua_State *L) {

-   luaL_dostring(L,lua_code_block);

- }

- 

- 

-+#if 0

- #line 2010 "winapi.l.c"

- int init_mutex(lua_State *L) {

- setup_mutex();

-@@ -2769,9 +2819,11 @@
-  lua_pushinteger(L,REG_MULTI_SZ); lua_setfield(L,-2,"REG_MULTI_SZ");

-  lua_pushinteger(L,REG_EXPAND_SZ); lua_setfield(L,-2,"REG_EXPAND_SZ");

- }

-+#endif

- 

- #line 2126 "winapi.l.c"

- static const luaL_Reg winapi_funs[] = {

-+#if 0

-        {"set_encoding",l_set_encoding},

-    {"get_encoding",l_get_encoding},

-    {"encode",l_encode},

-@@ -2804,7 +2856,9 @@
-    {"get_processes",l_get_processes},

-    {"wait_for_processes",l_wait_for_processes},

-    {"setenv",l_setenv},

-+#endif

-    {"spawn_process",l_spawn_process},

-+#if 0

-    {"thread",l_thread},

-    {"make_timer",l_make_timer},

-    {"open_pipe",l_open_pipe},

-@@ -2817,6 +2871,7 @@
-    {"watch_for_file_changes",l_watch_for_file_changes},

-    {"open_reg_key",l_open_reg_key},

-    {"create_reg_key",l_create_reg_key},

-+#endif

-     {NULL,NULL}

- };

- 

-@@ -2829,16 +2884,24 @@
- #else

-     luaL_register(L,"winapi",winapi_funs);

- #endif

-+#if 0

-     Window_register(L);

- Event_register(L);

- Mutex_register(L);

-+#endif

- Process_register(L);

-+#if 0

- Thread_register(L);

-+#endif

- File_register(L);

-+#if 0

- Regkey_register(L);

-+#endif

- load_lua_code(L);

-+#if 0

- init_mutex(L);

- set_winapi_constants(L);

-+#endif

-     return 1;

- }

- 

---- a/wutils.h	2012-06-28 04:50:56.000000000 -0400
-+++ b/wutils.h	2013-11-19 22:59:15.224130460 -0500
-@@ -4,12 +4,17 @@
- 
- extern int mutex_locked;
- 
-+#if 0
- Ref make_ref(lua_State *L, int idx);
-+#endif
- void release_ref(lua_State *L, Ref ref);
-+#if 0
- int push_ref(lua_State *L, Ref ref);
-+#endif
- const char *last_error(int err);
- int push_error_msg(lua_State *L, LPCSTR msg) ;
- int push_error(lua_State *L);
-+#if 0
- int push_error_code(lua_State *L, int err);
- int push_ok(lua_State *L);
- int push_bool(lua_State *L, int bval);
-@@ -17,15 +22,19 @@
- BOOL call_lua_direct(lua_State *L, Ref ref, int idx, LPCSTR text, int discard);
- void make_message_window();
- BOOL call_lua(lua_State *L, Ref ref, int idx, LPCSTR text, int discard);
-+#endif
- void lock_mutex();
- void release_mutex();
-+#if 0
- void setup_mutex();
- 
- // encoding and converting text
- void set_encoding(int e);
- int get_encoding();
-+#endif
- 
- LPWSTR wstring_buff(LPCSTR text, LPWSTR wbuf, int bufsz);
-+#if 0
- int push_wstring_l(lua_State *L, LPCWSTR us, int len);
- int push_wstring(lua_State *L, LPCWSTR us);
- 
-@@ -33,5 +42,6 @@
- 
- int mb_const (LPCSTR name);
- LPCSTR mb_result (int res);
-+#endif
- 
- #endif
---- a/wutils.c	2012-06-28 04:50:56.000000000 -0400
-+++ b/wutils.c	2013-11-19 22:59:15.224130460 -0500
-@@ -12,6 +12,7 @@
- 
- typedef int Ref;
- 
-+#if 0
- /// make a reference to a Lua object.
- // @param L the state
- // @param idx the index of the value on the stack.
-@@ -21,6 +22,7 @@
-   lua_pushvalue(L,idx);
-   return luaL_ref(L,LUA_REGISTRYINDEX);
- }
-+#endif
- 
- /// release a reference to a Lua value.
- // @param L the state
-@@ -30,6 +32,7 @@
-   luaL_unref(L,LUA_REGISTRYINDEX,ref);
- }
- 
-+#if 0
- /// push a referenced value on the stack.
- // @param L the state
- // @param ref the reference
-@@ -39,6 +42,7 @@
-   lua_rawgeti(L,LUA_REGISTRYINDEX,ref);
-   return 1;
- }
-+#endif
- 
- const char *last_error(int err) {
-   static char errbuff[256];
-@@ -75,6 +79,7 @@
-   return push_error_msg(L,last_error(0));
- }
- 
-+#if 0
- /// push a particular Windows error.
- // @param L the state
- // @param err the error code
-@@ -192,6 +197,7 @@
-     SetWindowLongPtr(hMessageWin, GWLP_USERDATA, subclassedProc);
-   }
- }
-+#endif
- 
- static HANDLE hLuaMutex = NULL, hMutex = NULL;
- int mutex_locked = 0;
-@@ -210,6 +216,7 @@
-   ReleaseMutex(hMutex);
- }
- 
-+#if 0
- // this is a useful function to call a Lua function within an exclusive
- // mutex lock. There are two parameters:
- //
-@@ -255,7 +262,9 @@
-   return res;
- }
- 
-+#endif
- static int current_encoding = CP_ACP;
-+#if 0
- 
- /// set the encoding.
- // Will be one of `CP_ACP` or `CP_UTF8`
-@@ -271,6 +280,7 @@
- int get_encoding() {
-   return current_encoding;
- }
-+#endif
- 
- /// convert text to UTF-16 depending on encoding.
- // @param text the input multi-byte text
-@@ -290,6 +300,7 @@
-   }
- }
- 
-+#if 0
- /// push a wide string on the Lua stack with given size.
- // This converts to the current encoding first.
- // @param L the State
-@@ -389,4 +400,5 @@
-   default: return "?";
-   }
- }
-+#endif
-