4 files changed, 26 insertions, 11 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 602fc61d9..f59d5a706 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2211,11 +2211,20 @@ static void catch_sig(int sig)
 
 static int mysleep(int hund)    // sleep for 'hund' 1/100 seconds or stdin ready
 {
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
+        DWORD ret;
+
+        fflush(stdout);
+        ret = WaitForSingleObject(h, hund*10);
+        return ret != WAIT_TIMEOUT;
+#else
         struct pollfd pfd[1];
 
         pfd[0].fd = STDIN_FILENO;
         pfd[0].events = POLLIN;
         return safe_poll(pfd, 1, hund*10) > 0;
+#endif
 }
 
 //----- IO Routines --------------------------------------------
diff --git a/include/platform.h b/include/platform.h
index 232fead89..2b3ad42bd 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -379,6 +379,7 @@ typedef unsigned smalluint;
 
 #if ENABLE_PLATFORM_MINGW32
 # undef  HAVE_FDPRINTF
+# undef  HAVE_MEMRCHR
 # undef  HAVE_MKDTEMP
 # undef  HAVE_SETBIT
 # undef  HAVE_STRCASESTR
@@ -413,6 +414,7 @@ extern int fdprintf(int fd, const char *format, ...);
 #endif
 
 #ifndef HAVE_MEMRCHR
+#include <stddef.h>
 extern void *memrchr(const void *s, int c, size_t n) FAST_FUNC;
 #endif
 
diff --git a/scripts/defconfig.mingw32 b/scripts/defconfig.mingw32
index 754b9514b..7fa01ffe0 100644
--- a/scripts/defconfig.mingw32
+++ b/scripts/defconfig.mingw32
@@ -358,21 +358,21 @@ CONFIG_FEATURE_DIFF_DIR=y
 CONFIG_ED=y
 # CONFIG_PATCH is not set
 CONFIG_SED=y
-# CONFIG_VI is not set
-CONFIG_FEATURE_VI_MAX_LEN=0
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
-# CONFIG_FEATURE_VI_COLON is not set
-# CONFIG_FEATURE_VI_YANKMARK is not set
-# CONFIG_FEATURE_VI_SEARCH is not set
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_USE_SIGNALS is not set
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
 # CONFIG_FEATURE_VI_WIN_RESIZE is not set
 # CONFIG_FEATURE_VI_ASK_TERMINAL is not set
 # CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
-# CONFIG_FEATURE_ALLOW_EXEC is not set
+CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
 # Finding Utilities
diff --git a/win32/termios.c b/win32/termios.c
index 34a17bbfd..390b90382 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -10,7 +10,7 @@ int tcgetattr(int fd UNUSED_PARAM, struct termios *t UNUSED_PARAM)
         return -1;
 }
 
-int64_t FAST_FUNC read_key(int fd, char *buf, int timeout UNUSED_PARAM)
+int64_t FAST_FUNC read_key(int fd, char *buf, int timeout)
 {
         HANDLE cin = GetStdHandle(STD_INPUT_HANDLE);
         INPUT_RECORD record;
@@ -24,6 +24,10 @@ int64_t FAST_FUNC read_key(int fd, char *buf, int timeout UNUSED_PARAM)
         GetConsoleMode(cin, &mode);
         SetConsoleMode(cin, 0);
 
+        if (timeout > 0) {
+                if (WaitForSingleObject(cin, timeout) != WAIT_OBJECT_0)
+                        goto done;
+        }
         while (1) {
                 if (!ReadConsoleInput(cin, &record, 1, &nevent_out))
                         goto done;