From eda73607a73fe5ff07eb52981df19c5bae129f70 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 Nov 2014 09:53:23 +0100
Subject: 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)

---
 src/ex_docmd.c | 9 ++++++++-
 src/version.c  | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 15ce34247..35e44f0f3 100644
--- 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 378818e66..ec0e667e2 100644
--- 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,
 /**/
-- 
cgit v1.2.1