summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-06-05 19:32:32 +0200
committerBram Moolenaar <Bram@vim.org>2017-06-05 19:32:32 +0200
commite21d69eec1870a3f4732653aa8ee25d5da10128c (patch)
tree3915070a783edb1fb908c3992d5564c68b0439b0 /src
parent206155280def51160a9d81d983aed639015ffb44 (diff)
downloadvim-git-e21d69eec1870a3f4732653aa8ee25d5da10128c.tar.gz
patch 8.0.0626: in the GUI the cursor may flickerv8.0.0626
Problem: In the GUI the cursor may flicker. Solution: Check the cmd_silent flag before updating the cursor shape. (Hirohito Higashi, closes #1637)
Diffstat (limited to 'src')
-rw-r--r--src/getchar.c12
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 2 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 18af2a374..ab3250aa3 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2913,8 +2913,16 @@ vgetorpeek(int advance)
}
#ifdef FEAT_GUI
/* may unshow different cursor shape */
- if (gui.in_use && shape_changed)
- gui_update_cursor(TRUE, FALSE);
+ if (gui.in_use)
+ {
+ if (cmd_silent)
+ gui_dont_update_cursor(TRUE);
+ else
+ gui_can_update_cursor();
+
+ if (shape_changed)
+ gui_update_cursor(TRUE, FALSE);
+ }
#endif
--vgetc_busy;
diff --git a/src/version.c b/src/version.c
index 0280ca810..65dc83f47 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 626,
+/**/
625,
/**/
624,