# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1381440401 -3600
# Node ID b10ee87ac76afed8564042481c3bee92072e760b
# Parent  abcbaf7f2e8eccfae8308d5faaf88804c153660d# Parent  22b1d18eb9199e2e22b7acd3dee2d96697fbaf18
Merge 0.9->0.10

diff -r abcbaf7f2e8e -r b10ee87ac76a util-src/windows.c
--- a/util-src/windows.c	Mon Oct 07 18:02:58 2013 -0400
+++ b/util-src/windows.c	Thu Oct 10 22:26:41 2013 +0100
@@ -58,7 +58,7 @@
 	
 	if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
 	if (!GetConsoleScreenBufferInfo(console, &info)) return lerror(L, "GetConsoleScreenBufferInfo");
-	if (!ReadConsoleOutputAttribute(console, &color, sizeof(WORD), info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
+	if (!ReadConsoleOutputAttribute(console, &color, 1, info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
 
 	lua_pushnumber(L, color);
 	return 1;