updated for version 7.4.494

Problem:    Cursor shape is wrong after a CompleteDone autocommand.
Solution:   Update the cursor and mouse shape after ":normal" restores the
            state. (Jacob Niehus)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 15ce34247ce8bfc80689706b7cc2b8ae896e9aa5..35e44f0f3c4a09f898e9cddd5dc5cc787eb93be6 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9526,8 +9526,15 @@ ex_normal(eap)
     msg_didout |= save_msg_didout;     /* don't reset msg_didout now */
 
     /* Restore the state (needed when called from a function executed for
-     * 'indentexpr'). */
+     * 'indentexpr'). Update the mouse and cursor, they may have changed. */
     State = save_State;
+#ifdef FEAT_MOUSE
+    setmouse();
+#endif
+#ifdef CURSOR_SHAPE
+    ui_cursor_shape();         /* may show different cursor shape */
+#endif
+
 #ifdef FEAT_MBYTE
     vim_free(arg);
 #endif

diff --git a/src/version.c b/src/version.c
index 378818e66d69a94136f2ea5505574ae41459d047..ec0e667e2fe1c87aa262bb09706e24852ccdfe20 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    494,
 /**/
     493,
 /**/