From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 1 Jul 2016 13:03:46 +0000 (+0200)
Subject: patch 7.4.1972
X-Git-Tag: v7.4.1972
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40de45664c20e7ca46a28a3f472202f90e47f8bf;p=vim

patch 7.4.1972
Problem:    On Solaris select() does not work as expected when there is
            typeahead.
Solution:   Add ICANON when sleeping. (Ozaki Kiichi)
---

diff --git a/src/os_unix.c b/src/os_unix.c
index f08adc58b..32c1640f9 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3411,7 +3411,13 @@ mch_settmode(int tmode)
 	tnew.c_cc[VTIME] = 0;		/* don't wait */
     }
     else if (tmode == TMODE_SLEEP)
-	tnew.c_lflag &= ~(ECHO);
+    {
+	/* Also reset ICANON here, otherwise on Solaris select() won't see
+	 * typeahead characters. */
+	tnew.c_lflag &= ~(ICANON | ECHO);
+	tnew.c_cc[VMIN] = 1;		/* return after 1 char */
+	tnew.c_cc[VTIME] = 0;		/* don't wait */
+    }
 
 # if defined(HAVE_TERMIOS_H)
     {
diff --git a/src/version.c b/src/version.c
index cfce60627..2c6d8c4a6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1972,
 /**/
     1971,
 /**/