patch 8.0.0626: in the GUI the cursor may flicker

Problem:    In the GUI the cursor may flicker.
Solution:   Check the cmd_silent flag before updating the cursor shape.
            (Hirohito Higashi, closes #1637)

diff --git a/src/getchar.c b/src/getchar.c
index 18af2a3740899a20383478081367c1321230144f..ab3250aa33bdceeb3eb495d52ec098d2b34ba2e8 100644 (file)
--- 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 0280ca810a05d5ccc4f4033b5b9fde075ffea422..65dc83f470ac4a656b5b80b370e95b2b8b6e1628 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    626,
 /**/
     625,
 /**/