Merge remote-tracking branch 'vim/master'

Author: splhack

src/term.c

@@ -4632,6 +4632,10 @@ check_termcode(
 			key_name[0] = (int)KS_EXTRA;
 			key_name[1] = (int)KE_IGNORE;
 			slen = i + 1 + (tp[i] == ESC);
+			if (tp[i] == 0x07 && i + 1 < len && tp[i + 1] == 0x18)
+			    /* Sometimes the 0x07 is followed by 0x18, unclear
+			     * when this happens. */
+			    ++slen;
 			break;
 		    }
 		if (i == len)

src/terminal.c

@@ -2316,10 +2316,12 @@ create_vterm(term_T *term, int rows, int cols)
 
     /* For unix do not use a blinking cursor.  In an xterm this causes the
      * cursor to blink if it's blinking in the xterm.
-     * We do want a blinking cursor by default on Windows, since that's what
-     * the default is for a console. */
+     * For Windows we respect the system wide setting. */
 #ifdef WIN3264
-    value.boolean = 1;
+    if (GetCaretBlinkTime() == INFINITE)
+	value.boolean = 0;
+    else
+	value.boolean = 1;
 #else
     value.boolean = 0;
 #endif

src/version.c

@@ -784,6 +784,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    994,
+/**/
+    993,
 /**/
     992,
 /**/