# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1467378905 -7200
# Node ID c665cc3292e0c70060f37a8d6e135ef2199a6c80
# Parent  a419e980f5b70f1b9d3279416dcfcc869c5793c0
commit https://github.com/vim/vim/commit/40de45664c20e7ca46a28a3f472202f90e47f8bf
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jul 1 15:03:46 2016 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1972,
+/**/
     1971,
 /**/
     1970,