Merge branch 'master' into dev

2012-10-23 23:30:16 +01:00
parent f8a4d21ab3 c2e94bfb20
commit 1c2d99c007
2 changed files with 18 additions and 6 deletions
--- a/src/input_win.c
+++ b/src/input_win.c
@@ -72,8 +72,11 @@ static void _parameter_autocomplete(char *input, int *size, char *command,
 void
 create_input_window(void)
 {
-    if (getenv("ESCDELAY") == NULL)
-        ESCDELAY = 25;
+#ifdef NCURSES_REENTRANT
+    set_escdelay(25);
+#else
+    ESCDELAY = 25;
+#endif

    int rows, cols;
    getmaxyx(stdscr, rows, cols);