summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-24 21:48:26 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-24 21:48:26 +0200
commitbe0b72977f1f1de14f231b5879d5c600ba72c6a6 (patch)
tree800393511c1fd10868745b8dda05a9851e7eefc9 /src
parentf6d9f96b2d67327bbadd7210acc7c6028439bbcd (diff)
downloadvim-git-be0b72977f1f1de14f231b5879d5c600ba72c6a6.tar.gz
patch 8.0.0994: MS-Windows: cursor in terminal blinks undesirablyv8.0.0994
Problem: MS-Windows: cursor in terminal blinks even though the blinking cursor was disabled on the system. Solution: Use GetCaretBlinkTime(). (Ken Takata)
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index c559d1173..c6dc0d995 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2311,10 +2311,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
diff --git a/src/version.c b/src/version.c
index e54b7bc4d..318053950 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 994,
+/**/
993,
/**/
992,